From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Fri, 21 Jan 2011 15:16:54 +0000 (+0100)
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=841c6942d39f322132376ef3fb24a53c743e2660

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

Conflicts:
	mediastreamer2
---

841c6942d39f322132376ef3fb24a53c743e2660