Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3a1a0c1f0edb438b3f1df12d09620180e18b4bd https://github.com/phpmyadmin/phpmyadmin/commit/b3a1a0c1f0edb438b3f1df12d096... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M libraries/php-gettext/gettext.inc Log Message: ----------- Use PATH_SEPARATOR for determining path separator Fixes error on servers with disabled php_uname Fixes #11944 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: f1c9b50a9c6476048137541b6b9bd336e1e39f0b https://github.com/phpmyadmin/phpmyadmin/commit/f1c9b50a9c6476048137541b6b9b... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M libraries/php-gettext/gettext.inc Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5042b6539879...f1c9b50a9c64