Merge 3.5 (os.waitpid)

author Victor Stinner <victor.stinner@gmail.com>

Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)

committer Victor Stinner <victor.stinner@gmail.com>

Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)
author Victor Stinner <victor.stinner@gmail.com>
Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)
committer Victor Stinner <victor.stinner@gmail.com>
Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)
diff --cc Lib/test/test_os.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/posixmodule.c
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)
committer	Victor Stinner <victor.stinner@gmail.com>
	Tue, 15 Sep 2015 08:24:27 +0000 (10:24 +0200)
		1	2
Lib/test/test_os.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/posixmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history