From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 30 Jan 2012 22:50:28 +0000 (+0100)
Subject: merge from tunnel branch
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=805e041a9a46c0b5c246fd32c1eed3a8149a44e3

merge from tunnel branch
---

diff --git a/.gitmodules b/.gitmodules
index 536466d2..0655d8e5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "mediastreamer2"]
 	path = mediastreamer2
 	url = git://git.linphone.org/mediastreamer2.git
-[submodule "tunnel"]
-	path = tunnel
-	url = gitosis@git.linphone.org:tunnel.git