projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f73178 2f787db)
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)
Conflicts:
include/emails.inc.php

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

Trivial merge
plat/al