From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 17 Apr 2012 16:05:54 +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=b213faf9bd8665d2dc3fbb60d57f8d7568e09136

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

b213faf9bd8665d2dc3fbb60d57f8d7568e09136