[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9f9d85: 4.2.1 release

[Marc Delisle]

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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.1 release

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