Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7ddabcaf1bbeda0c3c606de2831523b913451cc7 https://github.com/phpmyadmin/phpmyadmin/commit/7ddabcaf1bbeda0c3c606de28315... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-23 (Mon, 23 Feb 2015)

Changed paths: M ChangeLog M libraries/mysql_charsets.inc.php

Log Message: ----------- bug #4767 Drizzle: undefined index in mysql_charsets.inc.php

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

Commit: 8f9ff979fa252e5d273501eb1b31ff299afe8ef3 https://github.com/phpmyadmin/phpmyadmin/commit/8f9ff979fa252e5d273501eb1b31... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-23 (Mon, 23 Feb 2015)

Changed paths: M ChangeLog M libraries/mysql_charsets.inc.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f7a00a10e1e0...8f9ff979fa25