Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31792c8091dc9548e82ed66b3dd07e4612d0ecd5 https://github.com/phpmyadmin/phpmyadmin/commit/31792c8091dc9548e82ed66b3dd0... Author: Remi Collet fedora@famillecollet.com Date: 2014-09-22 (Mon, 22 Sep 2014)

Changed paths: M libraries/core.lib.php

Log Message: ----------- fix gettext include path

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: adf65c72081c6ae2da5adf8ff4e9159e1c60eef0 https://github.com/phpmyadmin/phpmyadmin/commit/adf65c72081c6ae2da5adf8ff4e9... Author: Michal Čihař michal@cihar.com Date: 2014-09-22 (Mon, 22 Sep 2014)

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9a72ea8426ec...adf65c72081c