summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-02 03:10:43 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-02 03:10:43 (GMT)
commit78a1a15c2029ebcbaba9801f9d1d50a55051e9fa (patch)
tree9d150acc473ff7a45f67c8de1dae253e7ed02aa0 /Misc/ACKS
parent54065d43ab80bde60575bc4f63736b9ef59f6a4b (diff)
downloadcpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.zip
cpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.tar.gz
cpython-78a1a15c2029ebcbaba9801f9d1d50a55051e9fa.tar.bz2
Merged revisions 86925 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86925 | r.david.murray | 2010-12-01 21:58:07 -0500 (Wed, 01 Dec 2010) | 4 lines #10464: fix netrc handling of lines with embedded '#" characters. Patch by Xuanji Li. ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4a36b6d..1606934 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -468,6 +468,7 @@ John Lenton
Christopher Tur Lesniewski-Laas
Mark Levinson
William Lewis
+Xuanji Li
Robert van Liere
Ross Light
Shawn Ligocki