Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8782c1c5b8b5e836dd0d52c2986e95d7eedb54b4 https://github.com/phpmyadmin/phpmyadmin/commit/8782c1c5b8b5e836dd0d52c2986e... Author: Marc Delisle marc@infomarc.info Date: 2013-12-27 (Fri, 27 Dec 2013)

Changed paths: M ChangeLog M libraries/display_import.lib.php

Log Message: ----------- bug #4131 Import: "number of rows to skip" is ambiguous

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

Commit: 9951278eb32f1c6c9995eb56d98009b956a497cb https://github.com/phpmyadmin/phpmyadmin/commit/9951278eb32f1c6c9995eb56d980... Author: Marc Delisle marc@infomarc.info Date: 2013-12-27 (Fri, 27 Dec 2013)

Changed paths: M ChangeLog M libraries/display_import.lib.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d23e1575e353...9951278eb32f