[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8e81b9: ChangeLog entry

[Marc Delisle]

  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8e81b913728d3139210ccb201d42b8f6ecace53d
      https://github.com/phpmyadmin/phpmyadmin/commit/8e81b913728d3139210ccb201d42b8f6ecace53d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M ChangeLog

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: f830b073196a75623e05150c2bfaa2b08abede4b
      https://github.com/phpmyadmin/phpmyadmin/commit/f830b073196a75623e05150c2bfaa2b08abede4b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ee5e0d87188...f830b073196a