[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3d6362: 4.2.0-rc1

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3d6362a294a26b94005fe26eb9af018a54399ebb
      https://github.com/phpmyadmin/phpmyadmin/commit/3d6362a294a26b94005fe26eb9af018a54399ebb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

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

  Log Message:
  -----------
  4.2.0-rc1

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


  Commit: 4770f7e496fd99c28fafb05ceb471444a0dc8195
      https://github.com/phpmyadmin/phpmyadmin/commit/4770f7e496fd99c28fafb05ceb471444a0dc8195
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Log Message:
  -----------
  Merge commit '3d6362a' into QA_4_2


  Commit: fc2cd8f41b95de5b1f8b9067f30261ecd076d038
      https://github.com/phpmyadmin/phpmyadmin/commit/fc2cd8f41b95de5b1f8b9067f30261ecd076d038
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

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

  Log Message:
  -----------
  4.2.1-dev

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b77d8fa6d4da...fc2cd8f41b95