From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Wed, 23 Feb 2011 15:13:08 +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=f515a560bcaa0d098df885fd1264ed5db46350e5

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

Conflicts:
	mediastreamer2
---

f515a560bcaa0d098df885fd1264ed5db46350e5