[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 69369f: ChangeLog entry

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 69369fe8961bfeafb4b4277d355839e83b1e2d0b
      https://github.com/phpmyadmin/phpmyadmin/commit/69369fe8961bfeafb4b4277d355839e83b1e2d0b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: 72483414d1cf489c5fade5eacd2743d32afa8e89
      https://github.com/phpmyadmin/phpmyadmin/commit/72483414d1cf489c5fade5eacd2743d32afa8e89
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M po/it.po
    M po/ko.po
    M po/pt_BR.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/0f1367555841...72483414d1cf