commit | 6c62ac1a0168529dd17f8d3cbc9182dd5f95cb14 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Feb 05 22:29:46 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Feb 05 22:29:46 2015 -0500 |
tree | 00a6c70cf6eafa39784418c6975382cec626f6f8 | |
parent | d0a8f57ef915b2e5b30e3b0dfddd8ec40c850694 [diff] | |
parent | 104b9e0ccac493b77ea051cafdf2e02edf2ccfd3 [diff] |
merge 3.4 (#22735)