Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

This commit is contained in:
Simon Morlat 2011-06-10 16:01:39 +02:00
commit 2bf7b0c899

@ -1 +1 @@
Subproject commit 3c6e9bf14efefa4ddd078d7b24ce46b5177da3c7
Subproject commit 79cbc5277d3fae8a70ae42a4e958042484ca2725