[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 52b9b6: 4.0.5-rc1

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 52b9b6c81f6e62858c9e3d495925d5e2ab65ff75
      https://github.com/phpmyadmin/phpmyadmin/commit/52b9b6c81f6e62858c9e3d495925d5e2ab65ff75
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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

  Log Message:
  -----------
  4.0.5-rc1


  Commit: 6d2efd9c7b21971de07c6b72b844c11644bc253b
      https://github.com/phpmyadmin/phpmyadmin/commit/6d2efd9c7b21971de07c6b72b844c11644bc253b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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


  Commit: e73bfee67c89aa8afdf900339dc7c19fee18d7cb
      https://github.com/phpmyadmin/phpmyadmin/commit/e73bfee67c89aa8afdf900339dc7c19fee18d7cb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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

  Log Message:
  -----------
  4.0.6-dev


  Commit: cd0167fb80b1cdd44d4d81952083c04648b1a74b
      https://github.com/phpmyadmin/phpmyadmin/commit/cd0167fb80b1cdd44d4d81952083c04648b1a74b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fdb0ad1f69cc...cd0167fb80b1