Sylvain Berfini 82b74a8bb2 Merge branch 'master' into dev_vcard ... Conflicts: coreapi/friendlist.c		2016-01-29 11:41:57 +01:00
..
sal.h	Merge branch 'master' into dev_vcard	2016-01-29 11:41:57 +01:00