[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6af812: ChangeLog entry

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6af812ee44a0f7684d6218a0b1b2e8d97c653ec8
      https://github.com/phpmyadmin/phpmyadmin/commit/6af812ee44a0f7684d6218a0b1b2e8d97c653ec8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: 35dd99c4995f64a56755a668886ba79b05a65e3e
      https://github.com/phpmyadmin/phpmyadmin/commit/35dd99c4995f64a56755a668886ba79b05a65e3e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M po/ko.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/26b6ba50a641...35dd99c4995f