[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5d590e: Fix bug#4006

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5d590ef3d67b4f87b58dbda50e86519bf9b64d34
      https://github.com/phpmyadmin/phpmyadmin/commit/5d590ef3d67b4f87b58dbda50e86519bf9b64d34
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M import.php
    M libraries/import.lib.php

  Log Message:
  -----------
  Fix bug#4006


  Commit: 80e6ecc1c2811e17b2eefdda7ba12248a4f9660e
      https://github.com/phpmyadmin/phpmyadmin/commit/80e6ecc1c2811e17b2eefdda7ba12248a4f9660e
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M import.php
    M libraries/import.lib.php

  Log Message:
  -----------
  Merge commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34'

Conflicts:
	import.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1da0b0b2115e...80e6ecc1c281