commit | de8eca46385842a2d5c75ee5a9a8c596735f9c68 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Mar 04 22:50:25 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Mar 04 22:50:25 2015 -0500 |
tree | b22236bed104ef1b6c4d4e4604d533fb3bb64bb6 | |
parent | b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0 [diff] | |
parent | 990fcaac3c428569697f62a80fd95ab4d4b93151 [diff] |
merge 3.4