| commit | de2691d6f7fa2820788c3195714f814cf6a2ba74 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jul 11 16:33:50 2015 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 11 16:33:50 2015 -0700 |
| tree | 4246a733f133c9a0ad00e74cfe40c70cf5e9c796 | |
| parent | e5505175e52f37287de47440939649ccc979dab9 [diff] | |
| parent | 47066ee3db59e39d3567abf918d1fa621f9bca99 [diff] |
merge 3.5 (#24610)