summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:41:05 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:41:05 (GMT)
commit7b58a2bb1d904850293694b01de3bd21344d0ff2 (patch)
tree65f199e66392a6e1f3e1a12c1ac95e66ca8c3f57 /Misc
parent04ce06b6129eb0acb0b45f48fd239ce60c44ecf8 (diff)
parent5e4a7d8dc7781a4c0dfacecdc4db0eb34beb1391 (diff)
downloadcpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.zip
cpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.tar.gz
cpython-7b58a2bb1d904850293694b01de3bd21344d0ff2.tar.bz2
Merge 3.4 (asyncio)
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 d5a0563..357577a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1331,6 +1331,7 @@ Adam Simpkins
Ravi Sinha
Janne Sinkkonen
Ng Pheng Siong
+Yann Sionneau
George Sipe
J. Sipprell
Kragen Sitaker