[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b72638: Fix test failures

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b72638c6e12e4c00a01b1ac598098f93a1b1b433
      https://github.com/phpmyadmin/phpmyadmin/commit/b72638c6e12e4c00a01b1ac598098f93a1b1b433
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Fix test failures


  Commit: 1dc03b6702df9c1ec2b12f66dfd30e32d9eb484a
      https://github.com/phpmyadmin/phpmyadmin/commit/1dc03b6702df9c1ec2b12f66dfd30e32d9eb484a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/bootstrap-dist.php
    A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a02bd817e91e...1dc03b6702df