// $logged deprecated
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// small fixes
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// filemanager secu
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Fix some filemanager security problems
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6