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

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cf8b3330d30fa3fcfd55515f4b7b130e971a00c4
      https://github.com/phpmyadmin/phpmyadmin/commit/cf8b3330d30fa3fcfd55515f4b7b130e971a00c4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-02-21 (Sat, 21 Feb 2015)

  Changed paths:
    M ChangeLog

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

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


  Commit: 127ba15547a6c2c347227d0fb1af6db7d4a80549
      https://github.com/phpmyadmin/phpmyadmin/commit/127ba15547a6c2c347227d0fb1af6db7d4a80549
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-02-21 (Sat, 21 Feb 2015)

  Changed paths:
    M po/ja.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/64f71a769a84...127ba15547a6