Merge branch 'master' into dev_vcard

This commit is contained in:
Sylvain Berfini 2016-03-02 16:51:30 +01:00
commit 6cd3178ea9

@ -1 +1 @@
Subproject commit 5e653bfe4c8ea27d09c80d91794f0178a454851e
Subproject commit 4cffc635847863df00502b5991c84797b2f39a04