commit | 4f820ad20d061ab495afe6ba1675b6ed6a1a996d | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Sep 27 02:07:27 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Sep 27 02:07:27 2015 -0700 |
tree | d224a86f64efa836296615e18c27125c7a62a980 | |
parent | e0daa86ce9791de963781f91e92ceb9aeb671909 [diff] | |
parent | 6a9cee1510d0d9b173dda36bdce767774796b731 [diff] |
merge heads