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

Conflicts:
	mediastreamer2

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