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

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cffbd3cdc37dea9a31231598f2613eebe8a6a9a9 https://github.com/phpmyadmin/phpmyadmin/commit/cffbd3cdc37dea9a31231598f26… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-08 (Wed, 08 Jul 2015) Changed paths: M test/libraries/PMA_page_settings_test.php Log Message: ----------- Fix failing tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 3a1f7d3a48be120a005492170c35be72402dda2a https://github.com/phpmyadmin/phpmyadmin/commit/3a1f7d3a48be120a005492170c3… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-08 (Wed, 08 Jul 2015) Changed paths: M po/ru.po M po/zh_TW.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a7c58fd49c35...3a1f7d3a48be