| commit | 47066ee3db59e39d3567abf918d1fa621f9bca99 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jul 11 16:33:39 2015 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 11 16:33:39 2015 -0700 |
| tree | 298efdfac22a84581a40247a574ca6c5aaa520ce | |
| parent | 05121159b3b8d2764847a2cff782bb9ecf773dc0 [diff] | |
| parent | acb3a4d88bdee64096ed4f00c9d464b6b4513658 [diff] |
merge 3.4 (#24610)