summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-02-09 16:53:09 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-02-09 16:53:09 (GMT)
commit54319287c9b3df17c0f6ce15b14619a9814ae292 (patch)
tree24718ad101ee49d9c2fddfe86d0bb61668b005c0 /Misc/ACKS
parent0f36573f10fb1125042ada81b9feaee0c5b8a9ff (diff)
downloadcpython-54319287c9b3df17c0f6ce15b14619a9814ae292.zip
cpython-54319287c9b3df17c0f6ce15b14619a9814ae292.tar.gz
cpython-54319287c9b3df17c0f6ce15b14619a9814ae292.tar.bz2
Merged revisions 78123 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r78123 | antoine.pitrou | 2010-02-09 17:51:16 +0100 (mar., 09 févr. 2010) | 5 lines Issue #6233: ElementTree failed converting unicode characters to XML entities when they could't be represented in the requested output encoding. Patch by Jerry Chen. ........
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 c5d0e30..2ea5ab9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -126,6 +126,7 @@ Greg Chapman
Brad Chapman
David Chaum
Nicolas Chauvat
+Jerry Chen
Michael Chermside
Albert Chin-A-Young
Adal Chiriliuc