Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3bacb683059c9c9afe21e08204b89d741450566a https://github.com/phpmyadmin/phpmyadmin/commit/3bacb683059c9c9afe21e08204b8... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)

Changed paths: M import.php

Log Message: ----------- Make sure format is always defined

Fixes #11955

Signed-off-by: Michal Čihař michal@cihar.com

Commit: bc2990d5bdcff672a3d5c5b03c85ce05fd51386b https://github.com/phpmyadmin/phpmyadmin/commit/bc2990d5bdcff672a3d5c5b03c85... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)

Changed paths: M import.php

Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c90e01f4ce6e...bc2990d5bdcf