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

This commit is contained in:
Ghislain MARY 2013-01-23 15:03:03 +01:00
commit 241d08f394

@ -1 +1 @@
Subproject commit 7e06844a252e4e55355076ffecf4c434b297e13e
Subproject commit 39bbe2656bec0e51b8b0c7cffd92faf38de2cd7a