commit | fcc2e71e99edb668cad539dc8fa9f259d0b389b6 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Nov 14 15:14:42 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Nov 14 15:14:42 2015 -0800 |
tree | ab5c934afb2df480e5a1bb949974ace99a42ab09 | |
parent | 7e2b870b8593233306594237cd5286c60ec7a1e1 [diff] | |
parent | 025a1fd9907bb439db9a812c78b8f18dbf4bad9e [diff] |
merge 3.4 (#25578)