summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-31 18:16:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-31 18:16:17 (GMT)
commit67f7a5ad797e261f23cbdd43e13c57b0f5bec12b (patch)
tree5d9a9324c0656840fbbf3378e78e6fc457695715
parentd97eb0d338f3d5746ba4bbd3cfe6e7c28948d41e (diff)
parent37d2c99b2207a53a9cba3ac58dc82dab2356f5cb (diff)
downloadcpython-67f7a5ad797e261f23cbdd43e13c57b0f5bec12b.zip
cpython-67f7a5ad797e261f23cbdd43e13c57b0f5bec12b.tar.gz
cpython-67f7a5ad797e261f23cbdd43e13c57b0f5bec12b.tar.bz2
merge 3.2
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c760a34..845375d 100644
--- 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.