
Patrick Barroca
authored
# Conflicts: # library/Class/Profil.php # library/ZendAfi/View/Helper/Accueil/Base.php # library/ZendAfi/View/Helper/FonctionsAdmin.php # tests/application/modules/opac/controllers/RechercheControllerTest.php # tests/library/ZendAfi/View/Helper/Accueil/RechSimpleTest.php