From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 15 Feb 2011 14:08:23 +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=aadd9b0b02898e573d6e357f807d95df916e5a16

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

aadd9b0b02898e573d6e357f807d95df916e5a16