From 805e041a9a46c0b5c246fd32c1eed3a8149a44e3 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 30 Jan 2012 23:50:28 +0100
Subject: [PATCH] merge from tunnel branch

---
 .gitmodules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 536466d28..0655d8e56 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