commit | 2a48a6eb335e496220aa75f6daae5b56e231b8e4 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 19:58:11 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jul 04 19:58:11 2015 -0500 |
tree | a64d419a7608dac39b456a7e98f99e4ae248b945 | |
parent | 09e60588389710232030a39b1ae9ba99542ba602 [diff] | |
parent | a82f77fb00ca3bd3eb27a6a5d77a19eadcf0ba31 [diff] |
merge 3.3 (#24407)