Issue #29078: Merge 3.5.

zhangyangyu · zhangyangyu · commit b8a1aebb3d60 · 2016-12-27T12:30:42.000+08:00
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
@@ -1582,7 +1582,7 @@ Instance methods:
 
 Example:
 
-    >>> from datetime import time, tzinfo
+    >>> from datetime import time, tzinfo, timedelta
     >>> class GMT1(tzinfo):
     ...     def utcoffset(self, dt):
     ...         return timedelta(hours=1)
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1704,11 +1704,11 @@ Nickolai Zeldovich
 Yuxiao Zeng
 Uwe Zessin
 Cheng Zhang
-Xiang Zhang
 Kai Zhu
 Tarek Ziadé
 Jelle Zijlstra
 Gennadiy Zlobin
 Doug Zongker
 Peter Åstrand
 evilzero
+Dhushyanth Ramasamy
