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

This commit is contained in:
Yann Diorcet 2012-05-16 10:15:59 +02:00
commit e2f84719d6

@ -1 +1 @@
Subproject commit f726584f2a708f2f8a0c9d1933018382364cbf15
Subproject commit eae923bd8fd87476f0dddcde6d54824147d031fb