From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 10 May 2011 16:07:56 +0000 (+0200)
Subject: Merge branch 'master' of belledonne-communications.com:linphone-private
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=0f8e893f80a37780daa37a719d3dd1f0975e59fc

Merge branch 'master' of belledonne-communications.com:linphone-private
---

0f8e893f80a37780daa37a719d3dd1f0975e59fc