| commit | 305e3557e94735bbccde8ab2b881c93afa067e13 | [log] [tgz] |
|---|---|---|
| author | Barry Warsaw <barry@python.org> | Mon Jan 11 15:53:51 2016 -0500 |
| committer | Barry Warsaw <barry@python.org> | Mon Jan 11 15:53:51 2016 -0500 |
| tree | 0c9448c2b1803885b908d163b837ea0f94544ebc | |
| parent | 0633cb7d7a19b2b300bf90edd72bf80ff707bfd3 [diff] | |
| parent | 3d220cc4d7be841e97d2b43bde6534081b06c001 [diff] |
Merge heads.