commit | 77c041ba64f87ac021c2a7a9314d9a3a1145057f | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Feb 16 19:45:42 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Feb 16 19:45:42 2015 -0500 |
tree | e0f19e9fa4974fe541862907eae85fe1c3b5ba0a | |
parent | 43036a66c37075534febdc4a4caaae8a364a9942 [diff] | |
parent | 54237f9feaefd209c2aaa5b4003810e69f6714f3 [diff] |
merge 3.4 (#21548)