From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 21 May 2010 13:58:31 +0000 (+0200)
Subject: Merge branch 'master' of git.linphone.org:linphone-private
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=f5983cb6bccad38a7732ea523b455e7b1189944d

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

f5983cb6bccad38a7732ea523b455e7b1189944d