[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cf7436: ChangeLog entry

[Marc Delisle]

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

  Changed paths:
    M ChangeLog

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

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


  Commit: 1deac8fa43e836a134dc2e856583909c491777ef
      https://github.com/phpmyadmin/phpmyadmin/commit/1deac8fa43e836a134dc2e856583909c491777ef
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M po/nl.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/0d4c91ba3367...1deac8fa43e8