merge from tunnel branch

diff --git a/.gitmodules b/.gitmodules
index 536466d2809cf914501b8d17dcdacc9a884482a9..0655d8e56ae99aa4cff04291206d981dad996eb7 100644 (file)
--- 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