[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f63a36: bug fix #4185; changed action to import.php

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f63a36fbf812066a0f45566f2df2d208c87b0ba5 https://github.com/phpmyadmin/phpmyadmin/commit/f63a36fbf812066a0f45566f2df… Author: Archit Verma <architv07(a)gmail.com> Date: 2013-12-16 (Mon, 16 Dec 2013) Changed paths: M libraries/sql_query_form.lib.php Log Message: ----------- bug fix #4185; changed action to import.php Signed-off-by: Archit Verma <architv07(a)gmail.com> Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 9ca0b3516b06d9aec125c72e22da71f7ba5fcfd8 https://github.com/phpmyadmin/phpmyadmin/commit/9ca0b3516b06d9aec125c72e22d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-16 (Mon, 16 Dec 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for fix of bug #4185 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 2588725b029e70b04ca77dd338502f1307eb577d https://github.com/phpmyadmin/phpmyadmin/commit/2588725b029e70b04ca77dd3385… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-12-16 (Mon, 16 Dec 2013) Changed paths: M ChangeLog M libraries/sql_query_form.lib.php Log Message: ----------- Merge branch 'QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8f795c0128c5...2588725b029e