commit | b174b85c1a37ee7452d26d041c30519425e4d421 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun May 03 13:00:37 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sun May 03 13:00:37 2015 -0400 |
tree | e40fa218c2c64a10e0c64df5a015f39a52d38d14 | |
parent | 63a6a6fd41da648c9e79a2e347c151e1957d74e9 [diff] | |
parent | ac87ed7e9f0239b78459197cee3ddb1d2e77bc58 [diff] |
merge 3.4 (#24118)