commit | c28ab08887ae1de3a759d77a227f4a2c8d9c918f | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jan 18 21:51:11 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jan 18 21:51:11 2014 -0500 |
tree | c38b1d6ede22de9570abb92ce404bf209f9ebb97 | |
parent | 49776ef9e75065daf21c194c212cde73b378ff30 [diff] | |
parent | 3836593a2d9d8958325f3c312abb9207d47f87e6 [diff] |
merge 3.3 (#18574)