| commit | 60a2f49c8cfeb632d38c7ffb8db622049e760a54 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Jan 25 23:31:58 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 25 23:31:58 2015 -0500 |
| tree | 8336202c76d0838826a8d4d4d35d3d1b97198039 | |
| parent | b335dfe7fa95c8c68630e8f7dc738c7b66637e87 [diff] | |
| parent | 155ceaa454ad9a623cade5ed326e6e1e70ce109d [diff] |
merge 3.4 (#19996)