Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d55abcd5ffa1ea8785f1217f5b7d78a8a54b8542 https://github.com/phpmyadmin/phpmyadmin/commit/d55abcd5ffa1ea8785f1217f5b7d... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-11-24 (Tue, 24 Nov 2015)

Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php

Log Message: ----------- Fix issue 11684

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: fa36f00198381422eb1ea61f8ccccef8a166199c https://github.com/phpmyadmin/phpmyadmin/commit/fa36f00198381422eb1ea61f8ccc... Author: Deven Bansod devenbansod@users.noreply.github.com Date: 2015-11-26 (Thu, 26 Nov 2015)

Changed paths: M libraries/server_privileges.lib.php M test/libraries/PMA_server_privileges_test.php M user_password.php

Log Message: ----------- Merge pull request #11686 from devenbansod/fix_11684

Fix issue #11684

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/060884139c34...fa36f0019838