Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c1b4895f57e8d1c303adaf543f8ca63631734ccd https://github.com/phpmyadmin/phpmyadmin/commit/c1b4895f57e8d1c303adaf543f8c... Author: Michael Koch michael.koch@enough.de Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M po/de.po

Log Message: ----------- Translated using Weblate (German)

Currently translated at 95.2% (2636 of 2768 strings)

[CI skip]

Commit: 465d672fb027315a8fcba4e7a8a36aae88346a66 https://github.com/phpmyadmin/phpmyadmin/commit/465d672fb027315a8fcba4e7a8a3... Author: Weblate noreply@weblate.org Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M ChangeLog M libraries/Util.class.php

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

Commit: e93e128510426e7cd348f562492664ce5f2b8184 https://github.com/phpmyadmin/phpmyadmin/commit/e93e128510426e7cd348f5624926... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M ChangeLog M export.php M libraries/config.default.php M libraries/plugins/export/ExportXml.class.php

Log Message: ----------- Port 'bug #3120 Events are not exported when using xml' to QA_4_2

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: c77fafd0d170373f0e2a488d0731f681b610c1ec https://github.com/phpmyadmin/phpmyadmin/commit/c77fafd0d170373f0e2a488d0731... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M ChangeLog M libraries/Util.class.php M po/bg.po M po/ca.po M po/de.po M po/gl.po M po/ru.po

Log Message: ----------- Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 073f748e352d1b407bb5fec51e12174ef71a6935 https://github.com/phpmyadmin/phpmyadmin/commit/073f748e352d1b407bb5fec51e12... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_2'

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/795c6c607677...073f748e352d