Sylvain Berfini 1ed3fccf3a Merge branch 'master' into dev_vcard ... Conflicts: coreapi/friendlist.c java/common/org/linphone/core/LinphoneCore.java		2016-02-18 14:25:06 +01:00
..
linphone	Merge branch 'master' into dev_vcard	2016-02-18 14:25:06 +01:00