Merge branch 'platal-0.9.15'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 22 Feb 2008 19:51:50 +0000 (20:51 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 22 Feb 2008 19:51:50 +0000 (20:51 +0100)
commit08fa70684fd1332178cddb6b318151335fb4506c
tree2cc13cd670a88abc20830acbf62e8658a7df3be8
parentf08827407a2156c0bc7daf63f44e8ac3707c2a12
parent36611800156399e1744bae7ffff30f8561277c9d
Merge branch 'platal-0.9.15'

Conflicts:

configs/mails.conf

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
configs/mails.conf