[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6a5062: Fix failing tests

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6a5062af3dec6166b3a040b39a78f809ccac269c
      https://github.com/phpmyadmin/phpmyadmin/commit/6a5062af3dec6166b3a040b39a78f809ccac269c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Fix failing tests


  Commit: ecbcfa3e36efcb1e06e61dfdb1f2bcd89b1ac4be
      https://github.com/phpmyadmin/phpmyadmin/commit/ecbcfa3e36efcb1e06e61dfdb1f2bcd89b1ac4be
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M po/pt_BR.po
    M prefs_manage.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7c7b0eba0cb2...ecbcfa3e36ef