[Python-checkins] cpython (merge 3.4 -> default): Closes #22178: Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/7fafbb7e1a8f
changeset:   92075:7fafbb7e1a8f
parent:      92072:ca696ca204e0
parent:      92074:847a2bdd5bec
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Aug 11 15:01:28 2014 -0500
summary:
  Closes #22178: Merge with 3.4

files:
  Doc/library/winreg.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -322,7 +322,7 @@
    +-------+---------------------------------------------+
    | ``2`` | An integer giving when the key was last     |
    |       | modified (if available) as 100's of         |
-   |       | nanoseconds since Jan 1, 1600.              |
+   |       | nanoseconds since Jan 1, 1601.              |
    +-------+---------------------------------------------+
 
 

-- 
Repository URL: http://hg.python.org/cpython