commit | 2e02875544647cef4f1b137ce6247212985b88a4 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Apr 30 17:38:14 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Apr 30 17:38:14 2015 -0400 |
tree | 7b8546b3218749541e86381a9e60433678fd4f54 | |
parent | c4e335b67a5469e621fa4771454be99cc5aae791 [diff] | |
parent | 755640bf50074a97e15659abe5478e7300d080cc [diff] |
merge 3.4