// fix install/langs/pl/data/configuration.xml encoding
// Update addons alert
[-] CORE: Fix bug #PSCSX-4008, replace accents in aliases
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// typo in HTMLTemplate.php
// JS translation
Merge pull request #2307 from PhpMadman/patch-8

// typo in HTMLTemplate.php
// follow up https://github.com/PrestaShop/PrestaShop/pull/2309
[-] FO : Fix bug #PSCSX-2963, collapse blockcart in accordion  + norms
// handle partial refund on free order
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
Cannot access return array in AdminOrdersController.php

As seen in http://php.net/manual/en/language.types.array.php#example-102, is not possible to access the array key of the return of a function directly prior to PHP 5.4.

A temporary variable should be used to solve the problem for previous versions.
Merge pull request #2310 from snamor/patch-1

[-] BO : Cannot access return array in AdminOrdersController.php
// follwo up https://github.com/PrestaShop/PrestaShop/pull/1452
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] CORE : Fix #PSCFV-12405 fix stock available create multishop product
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
[+] CORE : Fix #PSCSX-3658 fix comment not remove in override module
// norm
// missing cleanNonUnicodeSupport in Validate class