commit | cf0d512fb454f41737f74c898a810756196f9d52 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Oct 06 19:37:15 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 06 19:37:15 2015 -0700 |
tree | 1e79a8d46d06da41533ee7600e73f31c4e38a25a | |
parent | 77d12ecaade4ef1b0719412cd85aeba81e3d4563 [diff] | |
parent | 0a8845e64fb89649ce75753ebec3ce5b910df651 [diff] |
merge heads