From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 12 Sep 2012 14:35:34 +0000 (+0200)
Subject: Merge branch 'master' of git://git.linphone.org/linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=5223b0c7c7b5b64bcf6e8461ea9a4fa165baf479

Merge branch 'master' of git://git.linphone.org/linphone
---

5223b0c7c7b5b64bcf6e8461ea9a4fa165baf479