From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Wed, 6 Apr 2011 13:15:22 +0000 (+0200)
Subject: Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=c807039a86749ea5cdb58291af66f066060e49d2

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
	mediastreamer2
---

c807039a86749ea5cdb58291af66f066060e49d2