Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12bf06e0166a6779b88e2c6f1a28edde546f9682 https://github.com/phpmyadmin/phpmyadmin/commit/12bf06e0166a6779b88e2c6f1a28... Author: Michal Čihař michal@cihar.com Date: 2016-03-01 (Tue, 01 Mar 2016)

Changed paths: M ChangeLog

Log Message: ----------- Add changelog for issue #12055

Signed-off-by: Michal Čihař michal@cihar.com

Commit: eb536f2c764d06b78db0be8734adf235adf95066 https://github.com/phpmyadmin/phpmyadmin/commit/eb536f2c764d06b78db0be8734ad... Author: Michal Čihař michal@cihar.com Date: 2016-03-01 (Tue, 01 Mar 2016)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4dce6ec2db40...eb536f2c764d