Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3f2c433fc9fd7b3b261daa2fde71738c9b859a3 https://github.com/phpmyadmin/phpmyadmin/commit/b3f2c433fc9fd7b3b261daa2fde7... Author: Marc Delisle marc@infomarc.info Date: 2014-07-30 (Wed, 30 Jul 2014)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- bug #4500 mysql_doc_template is not defined

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: ebb3ebea76f05e98f04aa806f37779e714bca13f https://github.com/phpmyadmin/phpmyadmin/commit/ebb3ebea76f05e98f04aa806f377... Author: Marc Delisle marc@infomarc.info Date: 2014-07-30 (Wed, 30 Jul 2014)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c58a9b8ed0de...ebb3ebea76f0