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

This commit is contained in:
Yann Diorcet 2012-05-23 16:40:46 +02:00
commit bccb024769

@ -1 +1 @@
Subproject commit 3279ea72e4938b7b9977e885cd990e981780ef80
Subproject commit 490c8ef097c334b2be8746ea8391077b0dc2f03b