Merge remote branch 'origin/master' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Mar 2010 16:09:54 +0000 (17:09 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 21 Mar 2010 16:09:54 +0000 (17:09 +0100)
commit34465ab035104f739a54ec62660f04f874448627
treeb3e68a460d53826a1bc7305e991eb170b48ddcae
parentedcea678a67333aa398b7be371b2d726edc1a23b
parent9e1816c7666767755abbc24f6a0df290efff81b6
Merge remote branch 'origin/master' into account
templates/emails/rewrite-in.mail.tpl