[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 036549: 4.2.12-dev

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 036549a8dea2c98d728f84f158dc184c377d2c50
      https://github.com/phpmyadmin/phpmyadmin/commit/036549a8dea2c98d728f84f158dc184c377d2c50
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

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

  Log Message:
  -----------
  4.2.12-dev

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


  Commit: bdb8a9abf3612728ea216d90e767a31306806d0d
      https://github.com/phpmyadmin/phpmyadmin/commit/bdb8a9abf3612728ea216d90e767a31306806d0d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Log Message:
  -----------
  Merge commit '036549a'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef94ba0ee56e...bdb8a9abf361