summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-31 18:16:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-10-31 18:16:22 (GMT)
commit9b80c675899cdd9ce3c8e8f215b10fd263e42480 (patch)
tree5a158113f906f41244774a8320d2a8423601b492 /Misc
parent7503e085882501c7a887d67b65f19b5ee9bfa361 (diff)
parent67f7a5ad797e261f23cbdd43e13c57b0f5bec12b (diff)
downloadcpython-9b80c675899cdd9ce3c8e8f215b10fd263e42480.zip
cpython-9b80c675899cdd9ce3c8e8f215b10fd263e42480.tar.gz
cpython-9b80c675899cdd9ce3c8e8f215b10fd263e42480.tar.bz2
merge 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 909bdff..1437411 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,7 +22,7 @@ Core and Builtins
written by Serhiy Storchaka.
- 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.