Jehan Monnier 819ca3bb78 Merge remote-tracking branch 'origin/master' into dev_lime ... Conflicts: coreapi/chat.c coreapi/help/filetransfer.c tester/message_tester.c		2014-06-30 20:26:21 +02:00
..
sal	Merge remote-tracking branch 'origin/master' into dev_lime	2014-06-30 20:26:21 +02:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00