Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel

This commit is contained in:
Ghislain MARY 2013-01-16 13:33:28 +01:00
commit 15331b3841

@ -1 +1 @@
Subproject commit d6b9b813eba377be8810033c83e2b735933389c9
Subproject commit e5bf94c156a581aafe64c6278956a2ad8e884cf4