Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5fefcdd9983b3ca8036cbfcd055e689dbe02ef26 https://github.com/phpmyadmin/phpmyadmin/commit/5fefcdd9983b3ca8036cbfcd055… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M test/classes/ErrorTest.php Log Message: ----------- Fix test expectations to match current filename Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a38e451cc80810a85519008c5d568e2e1c24e4e8 https://github.com/phpmyadmin/phpmyadmin/commit/a38e451cc80810a85519008c5d5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4d00b58fa20d...a38e451cc808