Merge branch 'platal-0.9.16' into platal-0.9.17
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 30 Jun 2008 20:22:58 +0000 (22:22 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 30 Jun 2008 20:22:58 +0000 (22:22 +0200)
commit527ccdb5d9e3a120168331f4aa3070f6c574228e
tree82c19a86ded6431efc53bdd7ecd9b9ed4d986b9d
parent8827fc527a97ffe15a84a23874cd7d7707f3bb92
parent71d7ae6f1d7bbdea859f4d9703ad689ad75c1b68
Merge branch 'platal-0.9.16' into platal-0.9.17
configs/mails.conf