Merge branch 'platal-0.9.15'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 17 Jan 2008 08:02:06 +0000 (09:02 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 17 Jan 2008 08:02:06 +0000 (09:02 +0100)
commitdd9bac8f7903e9924525ad8db3e38650ff5ad1b6
treee95789da11089c22eba32d7648034aca1e2ab404
parent1152ff74b0025bb4aed57c09407968461e872a23
parent6101048c8e3feef55b7366ca691d4397294f52c2
Merge branch 'platal-0.9.15'

Conflicts:

templates/search/quick.tpl

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