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

This commit is contained in:
Simon Morlat 2012-11-22 22:03:20 +01:00
commit 527ca0f4dd

@ -1 +1 @@
Subproject commit fd650dfd92c307a35f1820e157dba5d1b185ede6
Subproject commit 55a86251dd3dd6516f5ecef45a39371826f69c9a