Merge commit 'origin/platal-0.9.15'

Conflicts:

	ChangeLog
	htdocs/css/keynote.css

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --cc bin/cron/banana.feedgen.php
Simple merge

diff --cc include/banana/ml.inc.php
Simple merge

diff --cc include/emails.inc.php
Simple merge

diff --cc include/xorg.misc.inc.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc templates/events/index.tpl
Simple merge