summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <aeric@mtlpy.org>2012-12-09 03:47:03 (GMT)
committerÉric Araujo <aeric@mtlpy.org>2012-12-09 03:47:03 (GMT)
commit24457c9ad375239aca9bd176284d1e4f181e02f4 (patch)
treedebeb009292f1615d17ea061a3ad528b41bfec2d /Misc
parent62a0d6ea402d18f528629c6e84ed6f46e7c0912a (diff)
parent8b503c0a4e82ba5aadd60215bf493529ce6e1821 (diff)
downloadcpython-24457c9ad375239aca9bd176284d1e4f181e02f4.zip
cpython-24457c9ad375239aca9bd176284d1e4f181e02f4.tar.gz
cpython-24457c9ad375239aca9bd176284d1e4f181e02f4.tar.bz2
Branch merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS3
-rw-r--r--Misc/NEWS9
2 files changed, 12 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4500d1a..4fc3659 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -222,6 +222,7 @@ David Costanzo
Scott Cotton
Greg Couch
David Cournapeau
+Julien Courteau
Steve Cousins
Alex Coventry
Matthew Dixon Cowles
@@ -512,6 +513,7 @@ Zbyszek Jędrzejewski-Szmek
Drew Jenkins
Flemming Kjær Jensen
Philip H. Jensen
+Philip Jenvey
MunSic Jeong
Chris Jerdonek
Pedro Diaz Jimenez
@@ -620,6 +622,7 @@ Thomas Lee
Christopher Lee
Tennessee Leeuwenburg
Luc Lefebvre
+Pierre Paul Lefebvre
Glyph Lefkowitz
Vincent Legoll
Kip Lehman
diff --git a/Misc/NEWS b/Misc/NEWS
index 5152c03..d90b40d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -181,6 +181,15 @@ Library
- Issue #16628: Fix a memory leak in ctypes.resize().
+- Issue #13614: Fix setup.py register failure with invalid rst in description.
+ Patch by Julien Courteau and Pierre Paul Lefebvre.
+
+- Issue #13512: Create ~/.pypirc securely (CVE-2011-4944). Initial patch by
+ Philip Jenvey, tested by Mageia and Debian.
+
+- Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking later
+ on. Initial patch by SilentGhost and Jeff Ramnani.
+
- Issue #13120: Allow to call pdb.set_trace() from thread.
Patch by Ilya Sandler.