commit | 5d2d63ed7dab4487e2f0f0d0f3d2cf5b185b5082 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 09 10:37:59 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 09 10:37:59 2015 -0400 |
tree | 3d4db571ef5a5ca09e91161fe93c8c832ed8e57c | |
parent | 551719be4a213494a6052bd3988746e097cd7947 [diff] | |
parent | 101447b3feb7326011e9f805264b92a4c927ad49 [diff] |
merge 3.4