Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 777d9f5fe415488a4717141a78f783d8a95a3aaf https://github.com/phpmyadmin/phpmyadmin/commit/777d9f5fe415488a4717141a78f7... Author: Marc Delisle marc@infomarc.info Date: 2014-04-17 (Thu, 17 Apr 2014)

Changed paths: M import_status.php

Log Message: ----------- Session-based upload progress was incompletely disabled since 063a2d99

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

Commit: 92b950db85eaeae89bbc67648962c61323c380e1 https://github.com/phpmyadmin/phpmyadmin/commit/92b950db85eaeae89bbc67648962... Author: Marc Delisle marc@infomarc.info Date: 2014-04-17 (Thu, 17 Apr 2014)

Changed paths: M import_status.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b8ca923968ec...92b950db85ea