[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d96dc0: Correction for 4.6.0-alpha1 release

[Isaac Bennetch]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d96dc09e99c8d05002cf955402e7733eb37ef378
      https://github.com/phpmyadmin/phpmyadmin/commit/d96dc09e99c8d05002cf955402e7733eb37ef378
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

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

  Log Message:
  -----------
  Correction for 4.6.0-alpha1 release

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


  Commit: c90d5a7485198930e079f464941dfe0235918971
      https://github.com/phpmyadmin/phpmyadmin/commit/c90d5a7485198930e079f464941dfe0235918971
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57c66d1a5e55...c90d5a748519