From: Brian Curtin <brian@python.org>
Date: Mon, 29 Oct 2012 23:20:18 +0000 (-0500)
Subject: Merge 3.3
X-Git-Tag: v3.4.0a1~2146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5e7cd06bb314f338eff3e2ef948ef35bed4487b;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3
---

a5e7cd06bb314f338eff3e2ef948ef35bed4487b
diff --cc Misc/NEWS
index 04e9f30f3bc1,44ae5f008c38..739b52b69539
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -12,9 +10,9 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #16197: Update winreg docstrings and documentation to match code.      
++- Issue #16197: Update winreg docstrings and documentation to match code.
+   Patch by Zachary Ware.
+ 
  - Issue #16241: Document -X faulthandler command line option.
    Patch by Marek Å uppa.