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

This commit is contained in:
Ghislain MARY 2012-12-19 11:31:27 +01:00
commit d5f6d26885

@ -1 +1 @@
Subproject commit 926a03a9c1f48d0fbd54b0e802d740774c100a78
Subproject commit f6a8615ab0c922ac2cb5c82c9824f6f4742b1725