Merge remote branch 'origin/platal-0.10.2'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Mar 2010 16:09:35 +0000 (17:09 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Mar 2010 16:09:35 +0000 (17:09 +0100)
1  2 
templates/emails/rewrite-in.mail.tpl

Simple merge