Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 98785f542754af2832acb60dc5b7e018ffd1d9fd https://github.com/phpmyadmin/phpmyadmin/commit/98785f542754af2832acb60dc5b7... Author: Marc Delisle marc@infomarc.info Date: 2015-10-10 (Sat, 10 Oct 2015)

Changed paths: M ChangeLog

Log Message: ----------- Fixes #11558 ChangeLog entry to mark the fix as complete

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

Commit: 914c12a9c29c1fef79163ec1b3f71f3d1f355fe0 https://github.com/phpmyadmin/phpmyadmin/commit/914c12a9c29c1fef79163ec1b3f7... Author: Marc Delisle marc@infomarc.info Date: 2015-10-10 (Sat, 10 Oct 2015)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7c1a14e481c...914c12a9c29c