Merge commit 'origin/platal-0.9.15'
authorPierre Habouzit <madcoder@debian.org>
Sun, 13 Jan 2008 22:32:34 +0000 (23:32 +0100)
committerPierre Habouzit <madcoder@debian.org>
Sun, 13 Jan 2008 22:32:34 +0000 (23:32 +0100)
commita7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe
tree76a2263ce979a507f074ef063867bd4801f0d748
parent9d66aa4a9c146715c3d50eb7e5817193f0978b17
parentb69b4654052feb3d1490f322e15788a114c70a8c
Merge commit 'origin/platal-0.9.15'

Conflicts:

ChangeLog
htdocs/css/keynote.css

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
bin/cron/banana.feedgen.php
include/banana/ml.inc.php
include/emails.inc.php
include/xorg.misc.inc.php
modules/search.php
templates/events/index.tpl