[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4db648: Fix failing test

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4db6481ea347d9409fa9d52f1bebe4b96ee377f6
      https://github.com/phpmyadmin/phpmyadmin/commit/4db6481ea347d9409fa9d52f1bebe4b96ee377f6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M test/libraries/PMA_FormDisplay_tpl_test.php

  Log Message:
  -----------
  Fix failing test

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 7fd24d164495ed81075168166a8634e5a83f2f6f
      https://github.com/phpmyadmin/phpmyadmin/commit/7fd24d164495ed81075168166a8634e5a83f2f6f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M test/libraries/PMA_FormDisplay_tpl_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/16fc3142350e...7fd24d164495