summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-11-03 21:07:40 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-11-03 21:07:40 (GMT)
commit8c997fa8bf5970eee0762664f598d13d5c5a48a8 (patch)
tree2946ba096350c9c45cf05b9aa61027c69bfee504 /Misc
parent51f61b93db406a5d65ab964f0a6c0c0e8e8e7515 (diff)
parent8f423c9359f75d26ee20c1e18f002743046abd72 (diff)
downloadcpython-8c997fa8bf5970eee0762664f598d13d5c5a48a8.zip
cpython-8c997fa8bf5970eee0762664f598d13d5c5a48a8.tar.gz
cpython-8c997fa8bf5970eee0762664f598d13d5c5a48a8.tar.bz2
Merge 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 7f29033..49081e8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -931,6 +931,7 @@ Michael Pomraning
Iustin Pop
Claudiu Popa
John Popplewell
+Guillaume Pratte
Amrit Prem
Paul Prescod
Donovan Preston