[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cbfb07: Update tests

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cbfb078442a0758c82b6756de903c2eb1610122a https://github.com/phpmyadmin/phpmyadmin/commit/cbfb078442a0758c82b6756de90… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Update tests Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 7937f8c5abf78bb47990e3a913fdc300be22e210 https://github.com/phpmyadmin/phpmyadmin/commit/7937f8c5abf78bb47990e3a913f… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M test/libraries/PMA_user_preferences_test.php Log Message: ----------- Merge branch 'QA_4_3' Commit: 479b1bc81fc90aa6104894c075bdac908151f512 https://github.com/phpmyadmin/phpmyadmin/commit/479b1bc81fc90aa6104894c075b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M po/sl.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ddbe648fa9a...479b1bc81fc9