Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c0548df2f9eeb9500be73137b77e9ad159637f57 https://github.com/phpmyadmin/phpmyadmin/commit/c0548df2f9eeb9500be73137b77e... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Log Message: ----------- Merge commit '01c553a' into QA_4_2 Commit: f2be36ae806429aa215a3b24779330921af4f25e https://github.com/phpmyadmin/phpmyadmin/commit/f2be36ae806429aa215a3b247793... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M ChangeLog M js/ajax.js A js/whitelist.php M libraries/Header.class.php M libraries/Scripts.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: bfc4c21b1f8cedc34ca3496124360a96396b79dd https://github.com/phpmyadmin/phpmyadmin/commit/bfc4c21b1f8cedc34ca349612436... Author: Kristjan Räts <kristjanrats@gmail.com> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 100.0% (2768 of 2768) [ci skip] Commit: e38891f07a7f08dae433940b5ad2f30e7d0cbd06 https://github.com/phpmyadmin/phpmyadmin/commit/e38891f07a7f08dae433940b5ad2... Author: Weblate <noreply@weblate.org> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M ChangeLog M js/ajax.js A js/whitelist.php M libraries/Header.class.php M libraries/Scripts.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 969aa8a98740d913517458ae2b592163effc1747 https://github.com/phpmyadmin/phpmyadmin/commit/969aa8a98740d913517458ae2b59... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Log Message: ----------- Merge commit 'c0548df' Commit: 308ae6fb9009be5591b015b60e03f5e83db464e6 https://github.com/phpmyadmin/phpmyadmin/commit/308ae6fb9009be5591b015b60e03... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Log Message: ----------- Merge commit 'e38891f' Commit: c8b4217e4216ea3a5d372d8e864a110b0caeba08 https://github.com/phpmyadmin/phpmyadmin/commit/c8b4217e4216ea3a5d372d8e864a... Author: Marc Delisle <marc@infomarc.info> Date: 2014-09-13 (Sat, 13 Sep 2014) Changed paths: M test/classes/PMA_Scripts_test.php Log Message: ----------- Fix tests Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c85c9fd4176e...c8b4217e4216