Sylvain Berfini 3b7c61e640 Merge branch 'master' into dev_vcard ... Conflicts: coreapi/CMakeLists.txt coreapi/Makefile.am coreapi/linphonecore.h java/common/org/linphone/core/LinphoneCore.java java/impl/org/linphone/core/LinphoneCoreImpl.java		2016-01-25 10:47:41 +01:00
..
linphone	Merge branch 'master' into dev_vcard	2016-01-25 10:47:41 +01:00