From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Apr 2013 12:34:49 +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=0dadf758c3bcd5ca26011cc2eee63a9abaa3e7fc

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

0dadf758c3bcd5ca26011cc2eee63a9abaa3e7fc