[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3c583b: Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-securi...

[Michal Čihař]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3c583b86d46f72f3ac331fea64fa02c3fbf38561
      https://github.com/phpmyadmin/phpmyadmin/commit/3c583b86d46f72f3ac331fea64fa02c3fbf38561
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/sql-parser/autoload.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security


  Commit: 51a0d2f25a71432570f59dd9053b9dbbc93733b3
      https://github.com/phpmyadmin/phpmyadmin/commit/51a0d2f25a71432570f59dd9053b9dbbc93733b3
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-29 (Mon, 29 Feb 2016)

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

  Log Message:
  -----------
  4.5.5.1 release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: 9eee3353a6141342f8b109d09737afde5550daf9
      https://github.com/phpmyadmin/phpmyadmin/commit/9eee3353a6141342f8b109d09737afde5550daf9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_5' into QA_4_6


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/12bf06e0166a...9eee3353a614