[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1876ca: 4.0.2-rc2

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1876ca7c3af45fa9ef0f85b14d9d9f84461f73ae
      https://github.com/phpmyadmin/phpmyadmin/commit/1876ca7c3af45fa9ef0f85b14d9d9f84461f73ae
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  4.0.2-rc2


  Commit: a2d487e536313af739e8c7cda1fb3b91136beb64
      https://github.com/phpmyadmin/phpmyadmin/commit/a2d487e536313af739e8c7cda1fb3b91136beb64
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-21 (Tue, 21 May 2013)

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


  Commit: e0c3c1d97749ae38cf2f6182f954e8dd88555649
      https://github.com/phpmyadmin/phpmyadmin/commit/e0c3c1d97749ae38cf2f6182f954e8dd88555649
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  4.0.3-dev


  Commit: 36fe6f404c5bfcf19f726fbdae725d807094f7b4
      https://github.com/phpmyadmin/phpmyadmin/commit/36fe6f404c5bfcf19f726fbdae725d807094f7b4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-21 (Tue, 21 May 2013)

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


  Commit: 4dc859e11d9c0dbb320a1aa455a6d46500ca638d
      https://github.com/phpmyadmin/phpmyadmin/commit/4dc859e11d9c0dbb320a1aa455a6d46500ca638d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-21 (Tue, 21 May 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f05276b09981...4dc859e11d9c