commit | cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Mar 03 22:08:01 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Mar 03 22:08:01 2016 -0800 |
tree | 34317302024fd957eca4cb5a7b759fca2a4208b3 | |
parent | ff47cfbc66b30e0714495cc74f92fa009bd8c1ca [diff] | |
parent | f11b25b0813a1c07ddf55cca1512ef65eb97a636 [diff] |
merge 3.4 (closes #26478)