| commit | 8e205f7b4f852d903db223d98b96721c4bc19644 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Aug 17 23:38:46 2015 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Aug 17 23:38:46 2015 -0700 |
| tree | 6336379f72cf13fcefa75a23990fc5cdc92d29c1 | |
| parent | 80ac11f95f1c6b3f11f25de074a2d6eb1e261dc2 [diff] | |
| parent | 2053aa119318c6bc931fff1cd76c1ab624e49232 [diff] |
merge 3.4 (#24883)