From 1727d4a1c997917c9597395eff4452943a2d9c95 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Mon, 24 Jan 2011 14:02:47 +0100
Subject: [PATCH] Merge

---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 9499aa102..dce5ac7d4 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9499aa102ece0ce8d065dfd89fa182a4151df5c5
+Subproject commit dce5ac7d4dc8e298cdedd5dcef55c60d7485206e