Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1684a1a56eedabfc0642675728cd5919f9d2eabd https://github.com/phpmyadmin/phpmyadmin/commit/1684a1a56eedabfc0642675728cd... Author: Tom Sommer tomsommer@users.noreply.github.com Date: 2015-05-12 (Tue, 12 May 2015)

Changed paths: M libraries/Config.class.php

Log Message: ----------- Fix undefined index 'collation_connection'

Make sure $GLOBALS[$collation] is set

Signed-off-by: Tom Sommer mail@tomsommer.dk

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

Commit: 969b46cca52afcf63c6beb3690e3e728444b8689 https://github.com/phpmyadmin/phpmyadmin/commit/969b46cca52afcf63c6beb3690e3... Author: Marc Delisle marc@infomarc.info Date: 2015-05-12 (Tue, 12 May 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry

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

Commit: 4426af36b1475e8d6d966b3f853720474277394c https://github.com/phpmyadmin/phpmyadmin/commit/4426af36b1475e8d6d966b3f8537... Author: Marc Delisle marc@infomarc.info Date: 2015-05-12 (Tue, 12 May 2015)

Changed paths: M ChangeLog M libraries/Config.class.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8d03fe316ac2...4426af36b147