[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 063a2d: bug #3964 Import using https does not work

[Marc Delisle]

  Branch: refs/heads/QA_4_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 063a2d9937c4dbd8a650eed9318967b17f5346b6
      https://github.com/phpmyadmin/phpmyadmin/commit/063a2d9937c4dbd8a650eed9318967b17f5346b6
  Author: Marc Delisle <marc at 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