Issue #29078: Merge 3.5.

author Xiang Zhang <angwerzx@126.com>

Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)

committer Xiang Zhang <angwerzx@126.com>

Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)
author Xiang Zhang <angwerzx@126.com>
Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)
committer Xiang Zhang <angwerzx@126.com>
Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)
diff --cc Doc/library/datetime.rst
Simple merge
diff --cc Misc/ACKS

index 73370ba2ea7bc713e539160da5db13223adaff28,66c36608af78b01f0636b7882d9da86cfbd14642..553b5278dee46c7fb4d0230ef6d94176d10d10af
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1712,3 -1684,5 +1711,4 @@@ Gennadiy Zlobi
   Doug Zongker
   Peter Åstrand
   evilzero
- -Chi Hsuan Yen
+ Dhushyanth Ramasamy
author	Xiang Zhang <angwerzx@126.com>
	Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)
committer	Xiang Zhang <angwerzx@126.com>
	Tue, 27 Dec 2016 04:30:42 +0000 (12:30 +0800)
		1	2
Doc/library/datetime.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history