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

This commit is contained in:
Sylvain Berfini 2012-08-02 12:18:17 +02:00
commit 271814cdfb

@ -1 +1 @@
Subproject commit c621a8ac69a33ae72f176689fa837bc5f0fb8eff
Subproject commit 94eb4afe778c5fab72ca3e4defca42bc2a4d8118