Merge branch 'master' of git://git.linphone.org/linphone

This commit is contained in:
Simon Morlat 2011-11-23 22:19:05 +01:00
commit 72a5086327

@ -1 +1 @@
Subproject commit 1fb4510269c0734aceef7133fe5eb91a65da3f55
Subproject commit b57969b05be247568e7b9dba9a7bc98fdc6d642c