From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 27 May 2013 09:18:35 +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=5355e37750d8c32fbd978161966ba80390a8bec0

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

5355e37750d8c32fbd978161966ba80390a8bec0