From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 14 Nov 2011 10:10:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'private/dev_videoios'
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=e6c0ee2f7caad4912c48d02ace476efcbb8da0c0

Merge remote-tracking branch 'private/dev_videoios'

Conflicts:
	mediastreamer2
---

e6c0ee2f7caad4912c48d02ace476efcbb8da0c0
diff --cc mediastreamer2
index fb45658a,7e80b7c9..4ee916b3
--- a/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fb45658a172fa53f0fd722b0660cc9b8c4396752
 -Subproject commit 7e80b7c99175ff4165814eaa90d13a7b1bd7a869
++Subproject commit 4ee916b3fcae0aba38a0d595079298242c9ac2cd