| commit | 88a928b6142c0ab3a9ab799b1652bb6d64e7face | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Feb 19 23:06:41 2014 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Feb 19 23:06:41 2014 -0500 |
| tree | ee8673077ac61584c78e4117b3247bed97c9d7d2 | |
| parent | d5797422dd4a970e2a47636d80296c2a7469e2b0 [diff] | |
| parent | a96fd48298db04cedbdb0cb75fc124ba58ff7bb4 [diff] |
merge 3.3 (#20695)