From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Mon, 6 Dec 2010 13:29:11 +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=9fc45b990045768c65a346e5b41a37ab8087d0b5

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

9fc45b990045768c65a346e5b41a37ab8087d0b5