commit | adf8627f41b22ba0d0ba47a0da12a49ba64064e7 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Oct 29 21:11:22 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Oct 29 21:11:22 2015 -0700 |
tree | 43e84c771a972c863fad4628607dbb3274cdae46 | |
parent | 788cb52905efa5be5d5a05d336940444ba332089 [diff] | |
parent | dcc13ef1e99f9a19bc43cc6e78bb83175c625bd7 [diff] |
merge 3.4 (#25504)