// allow whitelisted tags in translations
// unsplit string for better translatability
// added missing mod argument
// moved smartyPostProcessTranslation to Translate class
[-] FO : Fix customer privacy checkbox style
// some javascript clean
// undefined index
// Add divider to bulk actions
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// create/delete theme _meta when creating/deleting new meta
[-] FO : Fix bug #PSCSX-620, could not tweak colums on products-comparison
// trads
[-] FO : show discount table when discount on all combination
// fix a bug that prevented modules installation when language not on prestashop.com was present on shop
Merge pull request #1463 from djfm/translations

// fix a bug that prevented modules installation when language not on pr...
Merge pull request #1462 from djfm/1.6

[+] LO : Allow whitelisted HTML tags in smarty translation functions
//[*] BO : tree backward compat
[-] FO : Fixbug #PSCSX-734 FancyboxI18n
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// avoid sending history message twice