[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9c20e6: Fix error report #14350

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9c20e644a538e3bbaf5dce7ee992f52387242a5d
      https://github.com/phpmyadmin/phpmyadmin/commit/9c20e644a538e3bbaf5dce7ee992f52387242a5d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M ChangeLog
    M server_databases.php

  Log Message:
  -----------
  Fix error report #14350

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


  Commit: b1d955e3e195bb52d2482e5624009a74149f2360
      https://github.com/phpmyadmin/phpmyadmin/commit/b1d955e3e195bb52d2482e5624009a74149f2360
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-09-12 (Sat, 12 Sep 2015)

  Changed paths:
    M ChangeLog
    M server_databases.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/00482376a33b...b1d955e3e195