Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5d590ef3d67b4f87b58dbda50e86519bf9b64d34 https://github.com/phpmyadmin/phpmyadmin/commit/5d590ef3d67b4f87b58dbda50e86... Author: Atul Pratap Singh atulpratapsingh05@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/80e6ecc1c2811e17b2eefdda7ba1... Author: Michal Čihař mcihar@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