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

Conflicts:
	mediastreamer2
This commit is contained in:
Guillaume Beraudo 2011-01-21 16:16:54 +01:00
commit 841c6942d3

Diff content is not available