Merge branch 'master' of git.linphone.org:linphone

Conflicts:
	mediastreamer2
This commit is contained in:
Simon Morlat 2012-11-14 14:03:38 +01:00
commit 0268f14713

@ -1 +1 @@
Subproject commit 9e76d92b88d1359cbea328ef1350bd6c010eab7f
Subproject commit 709b5f4d68b714619e0ef50cacbb4a63c5717d21