commit | 49fc2c3bbaad9b5ecffe1293428beb4a06867a58 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun May 31 00:22:49 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun May 31 00:22:49 2015 -0500 |
tree | 80717101ae7f02f1c6213d2a103108652f209332 | |
parent | 23f8d52087552ecb7cf277226b8084fc9a93294a [diff] | |
parent | 3d4a457663d5b211e9357bd2ccfd60e0b5d9e57b [diff] |
merge 3.5