Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af95b435541dc390f9cb03d31787df514d358c35 https://github.com/phpmyadmin/phpmyadmin/commit/af95b435541dc390f9cb03d31787... Author: Giovanni Sora <g.sora@tiscali.it> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 72.5% (2329 of 3211 strings) [CI skip] Commit: 5f02ec86f325be8028fde0516228a08e226300b6 https://github.com/phpmyadmin/phpmyadmin/commit/5f02ec86f325be8028fde0516228... Author: Burak Yavuz <hitowerdigit@hotmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] Commit: ca32b9f51a73a7664962896641db13e1e7d7f583 https://github.com/phpmyadmin/phpmyadmin/commit/ca32b9f51a73a7664962896641db... Author: Weblate <noreply@weblate.org> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: 23a70525aecddc71f643e199eb2f2bc2228006d0 https://github.com/phpmyadmin/phpmyadmin/commit/23a70525aecddc71f643e199eb2f... Author: Marc Delisle <marc@infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: R scripts/decode_bug.php Log Message: ----------- This was related to the previous SQL parser. If someone still needs it to decode an old bug report, he/she can still get this script from an older branch. Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 0ca15a9c50cd8f56285d6554c62dad9a200c7434 https://github.com/phpmyadmin/phpmyadmin/commit/0ca15a9c50cd8f56285d6554c62d... Author: Marc Delisle <marc@infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Log Message: ----------- Merge commit 'ca32b9f' Commit: 40644b5c330ea79bf4b85b5c878a59906d85d6f2 https://github.com/phpmyadmin/phpmyadmin/commit/40644b5c330ea79bf4b85b5c878a... Author: Marc Delisle <marc@infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: R scripts/decode_bug.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/66c15daba0a4...40644b5c330e