Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 15 Nov 2008 16:12:58 +0000 (17:12 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 15 Nov 2008 16:12:58 +0000 (17:12 +0100)
commitb159e33797ccfb84478dd2dbde700c7d1867539f
treef6d8fe38ebd20e5c370bff45715dd749c8e3e2f2
parent065cd7ed086ef7806f294f92e675f16232704d6a
parent25a5652630c0619dc90fb5bc4a48af1841af54be
Merge commit 'origin/master' into fusionax

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
ChangeLog
templates/emails/redirect.tpl