Sylvain Berfini 4583352bad Merge branch 'master' into dev_vcard ... Conflicts: coreapi/Makefile.am coreapi/conference.h		2016-01-18 11:14:56 +01:00
..
linphone/core	Merge branch 'master' into dev_vcard	2016-01-18 11:14:56 +01:00