Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:21:24 +0000 (21:21 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 5 Jan 2009 20:21:24 +0000 (21:21 +0100)
commit8320b6fba6fa245dd71ae9c11b2a2a03f923d15d
tree41162def76de15526a05659c49e32e054ce75add
parentd1319488b2e06d8e1b943db37247f571d9b393dc
parenta415be4f1460f3702f9c07667caae34b7489d429
Merge commit 'origin/master' into fusionax

Conflicts:

modules/search.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
modules/admin.php
modules/search.php