Sylvain Berfini 6e38ee18d5 Merge branch 'master' into dev_vcard ... Conflicts: coreapi/linphonecore.c tester/presence_tester.c		2016-02-03 17:16:33 +01:00
..
sal.h	Merge branch 'master' into dev_vcard	2016-02-03 17:16:33 +01:00