Ioannis Tziakos c090b39195 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # zmq/tests/test_future.py		2017-08-14 20:49:37 +01:00
..
check_junit_result.py	update appveyor testing	2017-08-14 19:23:14 +01:00
run_with_env.cmd	bundle CRT when not static-linking on Python >= 3.5	2016-07-27 15:32:49 +02:00
tasks.py	allow prereleases in tasks.py	2017-08-14 13:37:11 +02:00