| commit | 9c422f3c3d0401aff0b2a5151181afcb508c928c | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 12:17:33 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 12:17:33 2014 -0400 |
| tree | 48db803392eb475c35a3885f6a670f9e09946913 | |
| parent | 60d7a731940d978cc152181507522f6b90240f97 [diff] | |
| parent | 1e211ff10dbab6da8fc7170bd09cd6fdaeec9dde [diff] |
merge 3.3