merge 3.2

f9566898 · Benjamin Peterson · cceb2366 · 3ca9e911 · f9566898
Commit f9566898 authored Oct 31, 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
@@ -16,7 +16,7 @@ Core and Builtins
  delete it on any type.

 - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass
-  recieved a nonempty dict from the constructor.
+  received a nonempty dict from the constructor.

 - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
  class's __dict__ and on type.