From 4466a132a44bde4221f0bf49159896d439449638 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 2 Jun 2015 18:42:43 +0200
Subject: [PATCH] update submodule linphone with a fix for conference in zrtp
 mode

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 42dcd96c6..ad1d7c12c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 42dcd96c6a2d822fec3caa0fde7c82fd22b44626
+Subproject commit ad1d7c12c9b459660b34d63408b144bf5890f3b6