| commit | b57eaeadff91fd1711289a43ecf2a13b54efde0a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:02:47 2016 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:02:47 2016 -0800 |
| tree | 13db90d8e696ebda98257d957e838e3e7af2ddd0 | |
| parent | 7172f507e18212dbc3afe53ce9dbdc696753c94c [diff] | |
| parent | c836f717cd73be8bcc9a0d09ba2d048bca9549f6 [diff] |
merge 3.4 (#26172)