commit | 2292defb3d3c117cf89486713fbb00222656accb | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Nov 27 20:41:36 2014 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Nov 27 20:41:36 2014 -0600 |
tree | 40844669479ceaa96818f993702e7822325faea0 | |
parent | 0a99b2ab61e506da60d9c48e440412a75399d4d0 [diff] | |
parent | 25c7d3fb2125f964fe5b9317b31de39117072150 [diff] |
merge 3.4 (#16561)