From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 25 Apr 2013 08:39:00 +0000 (+0200)
Subject: Merge commit 'a3f10cc'
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=bf3e43611778efc483999cacc470aed67fc6b83d

Merge commit 'a3f10cc'
---

bf3e43611778efc483999cacc470aed67fc6b83d