commit | 0a59d5563ecb632a61d8e45761824c76bfacbeea | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Nov 26 23:03:34 2014 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Nov 26 23:03:34 2014 -0600 |
tree | da4990124df498694403b88d11e4139ca2c1e0c2 | |
parent | 9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5 [diff] | |
parent | e823933f9f625607c1c17bb5ac174a0c1595875d [diff] |
merge 3.4 (#22954)