Sylvain Berfini 235dca249d Merge branch 'master' into dev_vcard ... Conflicts: build/android/Android.mk coreapi/private.h java/common/org/linphone/core/LinphoneCore.java java/impl/org/linphone/core/LinphoneCoreImpl.java		2016-02-09 10:21:18 +01:00
..
linphone	Merge branch 'master' into dev_vcard	2016-02-09 10:21:18 +01:00