From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Thu, 29 Nov 2012 16:23:45 +0000 (+0100)
Subject: Merge branch 'master' of git.linphone.org:linphone
X-Git-Url: http://sjero.net/git/?a=commitdiff_plain;h=f046faecea4b392121e32a637f1eabbe16f10986;p=linphone

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

f046faecea4b392121e32a637f1eabbe16f10986