two backports : resolving very minor conflicts
authorRaphael Marichez <falco@m4x.org>
Thu, 5 May 2005 11:58:59 +0000 (11:58 +0000)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 26 Jun 2008 21:28:52 +0000 (23:28 +0200)
commit0cf247cce554c7ec82177e2cad7a228fc3a1a5e1
treedbc87514d3ada2f028a3bee42524862bc9ad331a
parentd31ee653f1cb5c8cb69af4feea0d9aac9b65ff76
two backports : resolving very minor conflicts

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.5--patch-16
   manageurs bugfix / modif de JM

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-623
include/exalead/exalead.parser.inc.php
scripts/listes_redirect.php