From ea2d5666339611a8578dd9fab18444673cd79e70 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 6 Dec 2011 14:03:00 +0100
Subject: [PATCH] update ms2 for conference fixes

---
 coreapi/conference.c | 1 +
 mediastreamer2       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/coreapi/conference.c b/coreapi/conference.c
index 288ab2b46..4c7b0bffd 100644
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -164,6 +164,7 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
 
 int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){
 	int err=0;
+
 	if (!call->current_params.in_conference){
 		if (call->params.in_conference){
 			ms_warning("Not (yet) in conference, be patient");
diff --git a/mediastreamer2 b/mediastreamer2
index b5944d8d2..ff1da8a73 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b5944d8d25bec0acd992288fee03a5016a6b02ca
+Subproject commit ff1da8a73459c0239c89e40e4655cbf234fb36d8