Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6856cec9bd7821bc51a55d3dccde00ca41ef880 https://github.com/phpmyadmin/phpmyadmin/commit/a6856cec9bd7821bc51a55d3dcc… Author: Rytis Slatkevičius <rytis.s(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M po/lt.po Log Message: ----------- Translated using Weblate (Lithuanian) Currently translated at 67.7% (1764 of 2607) Commit: adb236894a37d1909a9f046432db487694fce9bb https://github.com/phpmyadmin/phpmyadmin/commit/adb236894a37d1909a9f046432d… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M libraries/Config.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 435dc9c74ae4accee927a2e571716aea80fd5a6c https://github.com/phpmyadmin/phpmyadmin/commit/435dc9c74ae4accee927a2e5717… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M sql.php Log Message: ----------- left while fixing bug#3936 Commit: 1be72f7f78ca5c9c5799460b54ae2decd6d51272 https://github.com/phpmyadmin/phpmyadmin/commit/1be72f7f78ca5c9c5799460b54a… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M libraries/Config.class.php M libraries/replication.inc.php M po/lt.po Log Message: ----------- Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 Commit: c26572b491bf6c5f4343e4b9c0fca4921f143c67 https://github.com/phpmyadmin/phpmyadmin/commit/c26572b491bf6c5f4343e4b9c0f… Author: Yungu Kim <crimsonpi(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 63.8% (1662 of 2605) Commit: 44422eb4d2f2a11b187b22824ec184d4eac2d7d5 https://github.com/phpmyadmin/phpmyadmin/commit/44422eb4d2f2a11b187b22824ec… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M sql.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 25237088c9422851ef169233dc0d197c52491a22 https://github.com/phpmyadmin/phpmyadmin/commit/25237088c9422851ef169233dc0… Author: Yungu Kim <crimsonpi(a)gmail.com> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 64.5% (1679 of 2605) Commit: 9b61212b4818e2760e48b63d32e5808409808bad https://github.com/phpmyadmin/phpmyadmin/commit/9b61212b4818e2760e48b63d32e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- bug #3946 Missing CSV import option "Do not abort on INSERT error" Commit: aa0306d310a795c26d646b159b03a30e53abaf82 https://github.com/phpmyadmin/phpmyadmin/commit/aa0306d310a795c26d646b159b0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Log Message: ----------- Merge commit 'adb2368' Commit: 5ac52185677e06c8aa352f8db89c8b763088483e https://github.com/phpmyadmin/phpmyadmin/commit/5ac52185677e06c8aa352f8db89… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Log Message: ----------- Merge commit '2523708' Commit: 4bdd15fd338a28c8e78f027d0f044ba56dd6ef9c https://github.com/phpmyadmin/phpmyadmin/commit/4bdd15fd338a28c8e78f027d0f0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be6bdb76ec0f...4bdd15fd338a