[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0134d5: bug #4060 Browser tries to remember wrong password...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0134d5154f70cea531f9a5d0f7e9867f331554b7
      https://github.com/phpmyadmin/phpmyadmin/commit/0134d5154f70cea531f9a5d0f7e9867f331554b7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  bug #4060 Browser tries to remember wrong password when creating new user


  Commit: 81bd6d4a02be69a6a96c85dea71a78f25ba029e9
      https://github.com/phpmyadmin/phpmyadmin/commit/81bd6d4a02be69a6a96c85dea71a78f25ba029e9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix merge conflict


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a77abb3cddb6...81bd6d4a02be