Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 063a2d9937c4dbd8a650eed9318967b17f5346b6 https://github.com/phpmyadmin/phpmyadmin/commit/063a2d9937c4dbd8a650eed93189... Author: Marc Delisle marc@infomarc.info Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M ChangeLog M doc/faq.rst M libraries/display_import_ajax.lib.php

Log Message: ----------- bug #3964 Import using https does not work

Commit: 3215d68c240d12de30ac8342a5cf326b1a15bb2f https://github.com/phpmyadmin/phpmyadmin/commit/3215d68c240d12de30ac8342a5cf... Author: Dadan Setia da2n_s@yahoo.co.id Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M po/id.po

Log Message: ----------- Translated using Weblate (Indonesian)

Currently translated at 74.8% (1946 of 2603)

Commit: 9b414c002563a9d6e742ab726c8a85f103595db7 https://github.com/phpmyadmin/phpmyadmin/commit/9b414c002563a9d6e742ab726c8a... Author: Weblate noreply@weblate.org Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M ChangeLog M doc/faq.rst M libraries/display_import_ajax.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

Commit: 684c85d90fde312290566006930c8d5e8bb15737 https://github.com/phpmyadmin/phpmyadmin/commit/684c85d90fde312290566006930c... Author: Marc Delisle marc@infomarc.info Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M ChangeLog M doc/faq.rst M libraries/display_import_ajax.lib.php

Log Message: ----------- Merge commit '063a2d9'

Commit: 21dab1ba05f2f69d7222f22536572e5982f57e37 https://github.com/phpmyadmin/phpmyadmin/commit/21dab1ba05f2f69d7222f2253657... Author: Marc Delisle marc@infomarc.info Date: 2013-06-10 (Mon, 10 Jun 2013)

Log Message: ----------- Merge commit '9b414c0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f23d7fc73634...21dab1ba05f2