commit | 3e7f3c032f68d6be5b8f3501ca7c4124394f3a6c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:53:55 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 22:53:55 2015 -0500 |
tree | 8cbc6c0a9c77e9717a83935d302c3f7cef420d5f | |
parent | 191a8f0a342f5f6c9fc6f1572a33e389d3f682b2 [diff] | |
parent | a111271ba7303dff9d52badfb5554807ea7d9f56 [diff] |
merge 3.5