Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e118098133241e68e5f3be2fc7ed1f5798f7dfc4 https://github.com/phpmyadmin/phpmyadmin/commit/e118098133241e68e5f3be2fc7ed... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-11 (Wed, 11 Apr 2012)

Changed paths: M ChangeLog M js/sql.js

Log Message: ----------- Merge branch 'QA_3_5'

Conflicts: ChangeLog

Commit: bf8dac8ecc52dd5db0c438a282a4aad740b19e7b https://github.com/phpmyadmin/phpmyadmin/commit/bf8dac8ecc52dd5db0c438a282a4... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-11 (Wed, 11 Apr 2012)

Changed paths: M js/functions.js M js/server_privileges.js M libraries/display_change_password.lib.php M libraries/tbl_properties.inc.php M themes/pmahomme/css/theme_right.css.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7943106...bf8dac8