[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2df5f8: 4.2.0 release

[Marc Delisle]

  Branch: refs/heads/MAINT_4_2_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2df5f88ea8a59485befb02d6763e96d4666a0887
      https://github.com/phpmyadmin/phpmyadmin/commit/2df5f88ea8a59485befb02d6763e96d4666a0887
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.0 release

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