// follow up 6c694ffdabd177dbbf19deb630e294c920fb07d9
// AdminPPreferencesController.php wording
Merge pull request #2297 from kpodemski/patch-1

// AdminPPreferencesController.php wording
// norms
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// small fix
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
[-] IN : possible bad value for id_order in order_history
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] FO : Fix #PSCSX-3875 carrier max weight
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
// typo
// oops
// small fix
// notice
[-] IN : Fix bug #PSCFV-11579, dynamic groups and states at install
// typo
// correct query
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
// warning