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

This commit is contained in:
Ghislain MARY 2013-01-09 14:47:07 +01:00
commit 4f021a7a26

@ -1 +1 @@
Subproject commit 8de31757c654b6ef041290811bc18aa8a3e13a18
Subproject commit 953949eba913d5f06a23facfc0be2cd12ce94dd0