VERSIONS_HOTLINE/merge_fix_on_patch_250

VERSIONS_WIP/21425

VERSIONS_WIP/dev19572_miop_typo3_import_vignettes

application/modules/admin/controllers/AlbumController.php

application/modules/admin/controllers/CmsController.php

...ation/modules/admin/views/scripts/accueil/critiques.phtml

application/modules/opac/controllers/BlogController.php

application/modules/opac/controllers/ModulesController.php

application/modules/opac/controllers/SitoController.php

...cation/modules/opac/views/scripts/blog/hierarchical.phtml

cosmogramme/php/_init.php

cosmogramme/sql/patch/patch_242.php

cosmogramme/sql/patch/patch_250.php

cosmogramme/sql/patch/patch_253.php

cosmogramme/sql/patch/patch_254.php

library/Class/AlbumCategorie.php

library/Class/AvisNotice.php

library/Class/Catalogue.php

library/Class/Import/Typo3.php

library/Class/Systeme/ModulesAccueil/Critiques.php