From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 28 Jun 2012 12:38:29 +0000 (+0200)
Subject: Merge branch 'master' of git.linphone.org:linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=5acfbd0ac39b1d134860eee554dfdec2c88a818e

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

5acfbd0ac39b1d134860eee554dfdec2c88a818e