[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d8b3f9: 4.2.6-dev

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d8b3f9a7664b26acf55546d1a7b296f44e38cced
      https://github.com/phpmyadmin/phpmyadmin/commit/d8b3f9a7664b26acf55546d1a7b296f44e38cced
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  4.2.6-dev

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


  Commit: f03b9314616c7cd4219ea09078b7f1ca35930e60
      https://github.com/phpmyadmin/phpmyadmin/commit/f03b9314616c7cd4219ea09078b7f1ca35930e60
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Log Message:
  -----------
  Merge branch 'QA_4_2'


  Commit: 39552e232a925aff3eff80f40a5bccbdd5cd3a37
      https://github.com/phpmyadmin/phpmyadmin/commit/39552e232a925aff3eff80f40a5bccbdd5cd3a37
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.6-dev

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8ce1e316a6a5...39552e232a92