Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88e0944cfd6c74c32bd57e209eaedbb32dd8314f https://github.com/phpmyadmin/phpmyadmin/commit/88e0944cfd6c74c32bd57e209eae... Author: Michal Čihař michal@cihar.com Date: 2016-02-29 (Mon, 29 Feb 2016)

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

Log Message: ----------- Honor vendor configuration for gettext inclusion

Fixes #12048

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

Commit: 2ebabd11fd37c74140097d26f5a73334064fb554 https://github.com/phpmyadmin/phpmyadmin/commit/2ebabd11fd37c74140097d26f5a7... Author: Michal Čihař michal@cihar.com Date: 2016-02-29 (Mon, 29 Feb 2016)

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19c7a069c78d...2ebabd11fd37