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

This commit is contained in:
Ghislain MARY 2013-01-04 09:39:42 +01:00
commit cb4b9ff308

@ -1 +1 @@
Subproject commit e829fa6e222f37de9c26e4e82f0227078f4b6629
Subproject commit 8de31757c654b6ef041290811bc18aa8a3e13a18