From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Mon, 13 Dec 2010 15:49:00 +0000 (+0100)
Subject: Merge branch 'master' of git.linphone.org:linphone-private
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=6ff25215befafa58466eea541beae27d2d685e7f

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

6ff25215befafa58466eea541beae27d2d685e7f