[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 874710: Bug Fix 4138

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 87471009280e32210c07a6fe8caeac475af535b2
      https://github.com/phpmyadmin/phpmyadmin/commit/87471009280e32210c07a6fe8caeac475af535b2
  Author: Spun Nakandala <supun.nakandala at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Bug Fix 4138


  Commit: 4859fcc5bc4b909c178737db9fb799ebaeccee7b
      https://github.com/phpmyadmin/phpmyadmin/commit/4859fcc5bc4b909c178737db9fb799ebaeccee7b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Merge pull request #733 from scnakandala/master

Bug Fix 4138


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0f4ff4dd54c9...4859fcc5bc4b