Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ae79ceb3a426c7da1a39e968d9b86e1d212b9dbc https://github.com/phpmyadmin/phpmyadmin/commit/ae79ceb3a426c7da1a39e968d9b8... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)

Changed paths: M ChangeLog M libraries/DatabaseInterface.php

Log Message: ----------- Do not error on unset server port

Fixes #12339

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 0c94e568bb094300e0f5669f5531bfbf1787b818 https://github.com/phpmyadmin/phpmyadmin/commit/0c94e568bb094300e0f5669f5531... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)

Changed paths: M ChangeLog

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f67d0e918ed4...0c94e568bb09