Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5298602f8edb4475fce5d299532c7780e0e314a5 https://github.com/phpmyadmin/phpmyadmin/commit/5298602f8edb4475fce5d299532c... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-29 (Thu, 29 Aug 2013) Changed paths: M ChangeLog M export.php M libraries/common.inc.php Log Message: ----------- bug #4046 Exporting huge Tables causes memory-Problems Commit: fc9297cc1a790a1e4a9dae3293990c95e1d6f493 https://github.com/phpmyadmin/phpmyadmin/commit/fc9297cc1a790a1e4a9dae329399... Author: shanyan baishui <Siramizu@gmail.com> Date: 2013-08-30 (Fri, 30 Aug 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 99.0% (2582 of 2609) Commit: e89eaffd3e10a9e89100c8bbc4efdd4f96e9dc24 https://github.com/phpmyadmin/phpmyadmin/commit/e89eaffd3e10a9e89100c8bbc4ef... Author: Weblate <noreply@weblate.org> Date: 2013-08-30 (Fri, 30 Aug 2013) Changed paths: M ChangeLog M libraries/Config.class.php M server_databases.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 634baaedb1c6fbceb6a3bda898c0251043e4de06 https://github.com/phpmyadmin/phpmyadmin/commit/634baaedb1c6fbceb6a3bda898c0... Author: Myung Han Yu <greatymh@gmail.com> Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 73.6% (1920 of 2609) Commit: e231569bcebd6fb3113d73c04baf83c956b4e84a https://github.com/phpmyadmin/phpmyadmin/commit/e231569bcebd6fb3113d73c04baf... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M ChangeLog M export.php M libraries/common.inc.php Log Message: ----------- Merge branch 'MAINT_4_0_6' into QA_4_0 Commit: 56a9031f4e25719112bb49f092d9ca65b65c4920 https://github.com/phpmyadmin/phpmyadmin/commit/56a9031f4e25719112bb49f092d9... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M ChangeLog M export.php M libraries/common.inc.php Log Message: ----------- Fix merge conflicts Commit: 90d65960823ba8ad50d239840087c0397a4e87c9 https://github.com/phpmyadmin/phpmyadmin/commit/90d65960823ba8ad50d239840087... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-31 (Sat, 31 Aug 2013) Log Message: ----------- Merge commit 'e231569' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b290df9280a...90d65960823b