Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 59036e15622243f7b68577233d0c1012a4b15f51 https://github.com/phpmyadmin/phpmyadmin/commit/59036e15622243f7b68577233d0c... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M test/libraries/PMA_operations_test.php Log Message: ----------- Simplify test to avoid need fo multiline regexp Cherry picked from master to avoid test suite failures on PHP 7. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 7db4672aebc2881e6226703f494b7312b090801d https://github.com/phpmyadmin/phpmyadmin/commit/7db4672aebc2881e6226703f494b... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Changed paths: M test/libraries/PMA_operations_test.php Log Message: ----------- Merge branch 'MAINT_4_5_4' into QA_4_5 Commit: d6df4fe290d992e2d0f5a5e01d6b673f9f3e2959 https://github.com/phpmyadmin/phpmyadmin/commit/d6df4fe290d992e2d0f5a5e01d6b... Author: Michal Čihař <michal@cihar.com> Date: 2016-01-19 (Tue, 19 Jan 2016) Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8beee5452658...d6df4fe290d9