Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:28:20 +0000 (14:28 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:28:20 +0000 (14:28 +0100)
commit4a55e7da9dd68b35034d207a25d8ffb292f30403
tree76d903d69757431289a325fc0e24a8c28952f44c
parent48ad52ee05f372465c9cab21492be3212ae96736
parente8627f9567e3f90f96fc3e66e2eabd00acfac35d
Merge commit 'origin/master' into fusionax

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
templates/search/adv.form.tpl