Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3d196ef57f5284370652f2d8fb4436a26fc5a99e https://github.com/phpmyadmin/phpmyadmin/commit/3d196ef57f5284370652f2d8fb44... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2016-02-11 (Thu, 11 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Fixes #11677. sql-parser and php-gettext collide. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> Commit: 1960ab70b0bbb264a38ffeb4bd2cb15693e757fe https://github.com/phpmyadmin/phpmyadmin/commit/1960ab70b0bbb264a38ffeb4bd2c... Author: Dan Ungureanu <udan1107@gmail.com> Date: 2016-02-11 (Thu, 11 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/c0f58c0674b5...1960ab70b0bb