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

This commit is contained in:
Ghislain MARY 2013-01-21 13:33:00 +01:00
commit bcb47ce504

@ -1 +1 @@
Subproject commit e5bf94c156a581aafe64c6278956a2ad8e884cf4
Subproject commit 7e06844a252e4e55355076ffecf4c434b297e13e