[phpMyAdmin Git] [phpmyadmin/phpmyadmin] dc5e05: Fix #11607 Unable to change password from Login in...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dc5e057fe2e11e0b599eaf9dfbe48342abd61cb3
      https://github.com/phpmyadmin/phpmyadmin/commit/dc5e057fe2e11e0b599eaf9dfbe48342abd61cb3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ChangeLog
    M server_privileges.php

  Log Message:
  -----------
  Fix #11607 Unable to change password from Login information tab - make the error message more explicit

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 4d4cb9a5c255020afc67eb4e012fa02de349ba03
      https://github.com/phpmyadmin/phpmyadmin/commit/4d4cb9a5c255020afc67eb4e012fa02de349ba03
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M ChangeLog
    M server_privileges.php

  Log Message:
  -----------
  Merge branch 'QA_4_5'

Conflicts:
	server_privileges.php


  Commit: 690c18f0ae5a878a40e3c199a4afa189c398b706
      https://github.com/phpmyadmin/phpmyadmin/commit/690c18f0ae5a878a40e3c199a4afa189c398b706
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M po/ko.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7a9b224071bb...690c18f0ae5a