Merge remote branch 'origin/platal-0.10.2'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 May 2010 19:18:56 +0000 (21:18 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 May 2010 19:18:56 +0000 (21:18 +0200)
commit93d42b4fcc6f055a428c9b63e386ac62c918d08a
tree51c8ec5e6dac8571d8af11aa892a4cc42889bde0
parent4f731783588a91a5f7902de13228d8b0879ffecd
parent2f787dbde94f86913db1487c46309478d29e4bb0
Merge remote branch 'origin/platal-0.10.2'

Conflicts:
include/emails.inc.php

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