Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
	mediastreamer2

diff --git a/mediastreamer2 b/mediastreamer2
index e7201e06c99afa14a33a1c4b47144daf467cbab1..cf11f11804476639cf4aa578cb5e04976b09f5c3 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e7201e06c99afa14a33a1c4b47144daf467cbab1
+Subproject commit cf11f11804476639cf4aa578cb5e04976b09f5c3