Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6e1b2aa54b9a206d8980396348d96cef4f74ecd8 https://github.com/phpmyadmin/phpmyadmin/commit/6e1b2aa54b9a206d8980396348d9... Author: Dan Ungureanu udan1107@gmail.com Date: 2015-08-02 (Sun, 02 Aug 2015)

Changed paths: M import.php

Log Message: ----------- Fix #11340.

Signed-off-by: Dan Ungureanu udan1107@gmail.com

Commit: 68569bd4f32ea8827727867a1ddedc04fae467ea https://github.com/phpmyadmin/phpmyadmin/commit/68569bd4f32ea8827727867a1dde... Author: Marc Delisle marc@infomarc.info Date: 2015-08-02 (Sun, 02 Aug 2015)

Changed paths: M import.php

Log Message: ----------- Merge pull request #11341 from udan11/fix_11340

Fix #11340.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eff0c569fa47...68569bd4f32e