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

Conflicts:
	mediastreamer2
This commit is contained in:
Guillaume Beraudo 2011-04-06 15:15:22 +02:00
commit c807039a86

Diff content is not available