[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5b0232: 4.0.8-dev

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5b023232db4df77cf1235a9781bd6b1248ac77b3
      https://github.com/phpmyadmin/phpmyadmin/commit/5b023232db4df77cf1235a9781bd6b1248ac77b3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

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

  Log Message:
  -----------
  4.0.8-dev


  Commit: f45a2f1e9a47f644e2e34deb000c60a6f0cd58d6
      https://github.com/phpmyadmin/phpmyadmin/commit/f45a2f1e9a47f644e2e34deb000c60a6f0cd58d6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Log Message:
  -----------
  Merge commit '5b02323'


  Commit: 9152158e2ccb52eb5750e44cd44032e2a1857cb4
      https://github.com/phpmyadmin/phpmyadmin/commit/9152158e2ccb52eb5750e44cd44032e2a1857cb4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d3ed64d6b22...9152158e2ccb