Merge 3.5 into 3.6

author Martin Panter <vadmium>

Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)

committer Martin Panter <vadmium>

Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)
author Martin Panter <vadmium>
Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)
committer Martin Panter <vadmium>
Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)
diff --cc Doc/library/os.rst
Simple merge
diff --cc Lib/test/test_os.py
Simple merge
diff --cc Modules/posixmodule.c
Simple merge
author	Martin Panter <vadmium>
	Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)
committer	Martin Panter <vadmium>
	Wed, 9 Sep 2015 06:28:08 +0000 (06:28 +0000)
		1	2
Doc/library/os.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_os.py	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/posixmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history