Margaux Clerc 4a8ce7f061 Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime ... Conflicts: build/android/Android.mk coreapi/chat.c coreapi/help/filetransfer.c tester/message_tester.c		2014-09-25 17:52:30 +02:00
..
sal.h	Merge commit '728ed3077cf4e47e6e972732a3f8a1b39a96f2ed' into dev_lime	2014-09-25 17:52:30 +02:00