Guillaume BIENKOWSKI e6209d9051 Merge commit '2e515642f07eb33974583587ddb2ee4669d4ff29' into dev_lime ... Conflicts: coreapi/chat.c		2014-11-27 18:01:33 +01:00
..
sal.h	Merge commit '2e515642f07eb33974583587ddb2ee4669d4ff29' into dev_lime	2014-11-27 18:01:33 +01:00