[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5778f6: 4.0.4-rc1

[Marc Delisle]

  Branch: refs/heads/QA_4_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5778f641b32d126ac4c363c2962764e63d5eae23
      https://github.com/phpmyadmin/phpmyadmin/commit/5778f641b32d126ac4c363c2962764e63d5eae23
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

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

  Log Message:
  -----------
  4.0.4-rc1


  Commit: 821a1373d7238f69018bec3d426ba5a73f159945
      https://github.com/phpmyadmin/phpmyadmin/commit/821a1373d7238f69018bec3d426ba5a73f159945
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_4' into QA_4_0


  Commit: 18b7f4e4d0deb26092c38e938728f98372ada4c4
      https://github.com/phpmyadmin/phpmyadmin/commit/18b7f4e4d0deb26092c38e938728f98372ada4c4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

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

  Log Message:
  -----------
  4.0.5-dev


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80dec52d987f...18b7f4e4d0de