Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f4fce01443d999d8f6ca7b366a93740eb861c2ce https://github.com/phpmyadmin/phpmyadmin/commit/f4fce01443d999d8f6ca7b366a93... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2013-09-14 (Sat, 14 Sep 2013) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Fix failing tests Commit: f98528a533ab554c426d1c12c6709eab719f6e61 https://github.com/phpmyadmin/phpmyadmin/commit/f98528a533ab554c426d1c12c670... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2013-09-14 (Sat, 14 Sep 2013) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Merge branch 'QA_4_0' Conflicts: test/classes/PMA_DisplayResults_test.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fe0baeebb157...f98528a533ab