[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e60278: Fix failing tests

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e60278b4146b66dcbdd5c8d9bc9a5de8f7002f4e https://github.com/phpmyadmin/phpmyadmin/commit/e60278b4146b66dcbdd5c8d9bc9… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-08 (Fri, 08 May 2015) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Fix failing tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: e3132374cc434f120b383417ff882e7953964849 https://github.com/phpmyadmin/phpmyadmin/commit/e3132374cc434f120b383417ff8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-08 (Fri, 08 May 2015) Changed paths: M test/classes/PMA_DisplayResults_test.php Log Message: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c59aef586091...e3132374cc43