Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5166ba5b6a842e3654b61f6e7f70a038f574d46c https://github.com/phpmyadmin/phpmyadmin/commit/5166ba5b6a842e3654b61f6e7f70... Author: thilinaa thilinaabeyrathna@gmail.com Date: 2012-08-20 (Mon, 20 Aug 2012)

Changed paths: M server_privileges.php

Log Message: ----------- fix bug #3559728 - cannot edit db-specific privileges

Commit: 04596468c36563d526802dbd96ba5a87322a3d7c https://github.com/phpmyadmin/phpmyadmin/commit/04596468c36563d526802dbd96ba... Author: Marc Delisle marc@infomarc.info Date: 2012-08-20 (Mon, 20 Aug 2012)

Changed paths: M server_privileges.php

Log Message: ----------- Merge branch 'thilina'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b4f1d2ba5e3...04596468c365