Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 760f6765b3c8e2c555757bc8ab43fd2eefad6fd4 https://github.com/phpmyadmin/phpmyadmin/commit/760f6765b3c8e2c555757bc8ab43... Author: Michal Čihař <michal@cihar.com> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M po/ro.po Log Message: ----------- Translated using Weblate (Romanian) Currently translated at 59.0% (1624 of 2749) Commit: 32c38e39658afc35259ffdcc125dcbf9dc8f7190 https://github.com/phpmyadmin/phpmyadmin/commit/32c38e39658afc35259ffdcc125d... Author: Chien Wei Lin <cwlin0416@gmail.com> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) Commit: 0bce0511739b0da6df88d2c0bfaa11c2bb42d55b https://github.com/phpmyadmin/phpmyadmin/commit/0bce0511739b0da6df88d2c0bfaa... Author: Weblate <noreply@weblate.org> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M js/makegrid.js M js/sql.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Commit: 8021f31e36f95afde4d05be7ecab7d1db08ba63c https://github.com/phpmyadmin/phpmyadmin/commit/8021f31e36f95afde4d05be7ecab... Author: Marc Delisle <marc@infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- bug #4201 Exports are not compressed Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 15ca54dee5c61a930e0febacb205157b8f0f5591 https://github.com/phpmyadmin/phpmyadmin/commit/15ca54dee5c61a930e0febacb205... Author: Marc Delisle <marc@infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Log Message: ----------- Merge commit '8021f31' Commit: a06464c59f591a232d544b8fad921550656e6458 https://github.com/phpmyadmin/phpmyadmin/commit/a06464c59f591a232d544b8fad92... Author: Marc Delisle <marc@infomarc.info> Date: 2013-12-26 (Thu, 26 Dec 2013) Changed paths: M ChangeLog M libraries/export.lib.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/74a7e1c0a4f9...a06464c59f59