summaryrefslogtreecommitdiffstats
path: root/Doc/ACKS.txt
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-07-25 05:14:15 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-07-25 05:14:15 (GMT)
commit432171c6872b0eaa1010657f7eb280136bf96890 (patch)
tree89aa9d0f0ab94fcd77ccebcd0c1a9cd85298a94c /Doc/ACKS.txt
parentdc1d548ecbf01925a3efef997865bb834e5738fd (diff)
parent59c01edcaa4a973e159d2ed3a5084936d3fffa18 (diff)
downloadcpython-432171c6872b0eaa1010657f7eb280136bf96890.zip
cpython-432171c6872b0eaa1010657f7eb280136bf96890.tar.gz
cpython-432171c6872b0eaa1010657f7eb280136bf96890.tar.bz2
Issue #12102: Merge with 3.2.
Diffstat (limited to 'Doc/ACKS.txt')
-rw-r--r--Doc/ACKS.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index e68826c..433c9ee 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -144,6 +144,7 @@ docs@python.org), and we'll be glad to correct the problem.
* Sjoerd Mullender
* Dale Nagata
* Michal Nowikowski
+ * Steffen Daode Nurpmeso
* Ng Pheng Siong
* Koray Oner
* Tomas Oppelstrup