diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-07 19:48:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-07 19:48:09 (GMT) |
| commit | 33919e8423784fa0172a0ce2d82ce1248be301bd (patch) | |
| tree | ba859bc1d42f2441eab1acc103a24b12a48523dc /Misc | |
| parent | 3e439797bad59948ff810aeaf7e992b23451ddd6 (diff) | |
| parent | 9b2731bfdd9756592ae86b2b053969d40c9fa151 (diff) | |
| download | cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.zip cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.tar.gz cpython-33919e8423784fa0172a0ce2d82ce1248be301bd.tar.bz2 | |
merge 3.4 (#21404)
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/ACKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -196,6 +196,7 @@ Roger Burnham Alastair Burt Tarn Weisner Burton Lee Busby +Katherine Busch Ralph Butler Nicolas Cadou Jp Calderone |