[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 60b063: 4.1.2-dev

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 60b063116a5353788123b63151d2af2634ba9291
      https://github.com/phpmyadmin/phpmyadmin/commit/60b063116a5353788123b63151d2af2634ba9291
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  4.1.2-dev

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


  Commit: 94edb81552d7628f73e2ef0fe608b641ae202ab0
      https://github.com/phpmyadmin/phpmyadmin/commit/94edb81552d7628f73e2ef0fe608b641ae202ab0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Log Message:
  -----------
  Merge commit '60b0631'


  Commit: a83ca394b8f9e82a99f498af82964bc90c30b0dd
      https://github.com/phpmyadmin/phpmyadmin/commit/a83ca394b8f9e82a99f498af82964bc90c30b0dd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.1.2-dev

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/664b9d94354f...a83ca394b8f9