Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3565e4db799098a56cd7e873cec668783b94d37f https://github.com/phpmyadmin/phpmyadmin/commit/3565e4db799098a56cd7e873cec6... Author: Michal Čihař michal@cihar.com Date: 2015-12-09 (Wed, 09 Dec 2015)

Changed paths: M libraries/Config.php M libraries/core.lib.php M test/classes/ConfigTest.php M test/libraries/core/PMA_array_test.php

Log Message: ----------- Remove PMA_arrayMergeRecursive

It can be replaced with array_replace_recursive as of PHP 5.3, we require PHP 5.5.

Signed-off-by: Michal Čihař michal@cihar.com