From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 2 Aug 2012 10:18:17 +0000 (+0200)
Subject: Merge branch 'master' of git.linphone.org:linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=271814cdfb76fa4fa1407d4b6ab9aa924b792d09

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

271814cdfb76fa4fa1407d4b6ab9aa924b792d09