Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9a40c11797d50925d7d7dfd07b2aecfb197612e0 https://github.com/phpmyadmin/phpmyadmin/commit/9a40c11797d50925d7d7dfd07b2a... Author: Marc Delisle marc@infomarc.info Date: 2015-12-28 (Mon, 28 Dec 2015)

Changed paths: M ChangeLog M import.php

Log Message: ----------- Fixes #11792 Undefined index: parameters

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: fb6e971a3b35abc3bb53b063562170da817d2838 https://github.com/phpmyadmin/phpmyadmin/commit/fb6e971a3b35abc3bb53b0635621... Author: Marc Delisle marc@infomarc.info Date: 2015-12-28 (Mon, 28 Dec 2015)

Changed paths: M ChangeLog M import.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cd3c5d6be79d...fb6e971a3b35