Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e627cf197c3ac7dcf6dc4c6beecac76a9cbfd169 https://github.com/phpmyadmin/phpmyadmin/commit/e627cf197c3ac7dcf6dc4c6beeca... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)

Changed paths: M test/libraries/php-gettext/PMA_FileReader_test.php M test/libraries/php-gettext/PMA_StreamReader_test.php M test/libraries/php-gettext/PMA_StringReader_test.php M test/libraries/php-gettext/PMA_gettext_test.php M test/libraries/php-gettext/Parsing_test.php

Log Message: ----------- Remove not needed includes

We already include this on bootstrap.

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

Commit: a370a692523d87fafe83944001f4e9494f4dc7ef https://github.com/phpmyadmin/phpmyadmin/commit/a370a692523d87fafe83944001f4... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b6747d0ad234...a370a692523d