merge 3.2

447f0cc3 · Benjamin Peterson · 6e3358a1 · 2c141466 · 447f0cc3
Commit 447f0cc3 authored Apr 18, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Misc/NEWS Misc/NEWS +1 -1

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,7 +19,7 @@ Core and Builtins
 - Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
  globals raises a KeyError.

- Issue #14607: Fix defaults keyword-only arguments which started with ``__``.
+- Issue #14607: Fix keyword-only arguments which started with ``__``.

 - Issue #10854: The ImportError raised when an extension module on Windows
  fails to import now uses the new path and name attributes from