diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-23 20:16:06 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-23 20:16:06 -0700 |
| commit | f5c5175b47c150966456835ce5c05c6271330562 (patch) | |
| tree | 1b0047ccf753c128831e8c0504e7d3672f1b8f57 | |
| parent | 5bb0c84a8f30b0939438917d26603864d902fcd0 (diff) | |
| parent | 17f9b64c63b87cb24027bc3751f77a254be00de1 (diff) | |
| download | cpython-git-f5c5175b47c150966456835ce5c05c6271330562.tar.gz | |
merge 3.4
| -rw-r--r-- | Misc/ACKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -415,6 +415,7 @@ Arnaud Fontaine Michael Foord Amaury Forgeot d'Arc Doug Fort +Chris Foster John Fouhy Andrew Francis Stefan Franke |