Merge remote-tracking branch 'public/master' into dev_linphone_qt

This commit is contained in:
Ronan Abhamon 2017-01-24 16:29:22 +01:00
commit 04961056d2

@ -1 +1 @@
Subproject commit cca80fbbe5bb258aace5a28f37cc463fc1f3a4b5
Subproject commit 64082f155fdc27f7cd0af4413f33f8a7d9d1979d