Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d711af903596c019c681e6230afa73d6213efeae https://github.com/phpmyadmin/phpmyadmin/commit/d711af903596c019c681e6230afa... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-02 (Thu, 02 Jan 2014)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Fix indentation

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 698157e1ba3d7851de17cbd0ca124fc3a1561a09 https://github.com/phpmyadmin/phpmyadmin/commit/698157e1ba3d7851de17cbd0ca12... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-02 (Thu, 02 Jan 2014)

Changed paths: M ChangeLog M libraries/structure.lib.php M test/libraries/PMA_structure_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0dd1fa9f89e0...698157e1ba3d