From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 22 Feb 2008 19:51:50 +0000 (+0100)
Subject: Merge branch 'platal-0.9.15'
X-Git-Tag: xorg/0.9.16~149
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=08fa70684fd1332178cddb6b318151335fb4506c;p=platal.git

Merge branch 'platal-0.9.15'

Conflicts:

	configs/mails.conf

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

08fa70684fd1332178cddb6b318151335fb4506c