commit | 1cbb3fe775c210459f53386b8172f5f2965ee33b | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 11:48:41 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 11:48:41 2014 -0400 |
tree | 718e76fe1cc9af45ccae267245787fce8fc913ce | |
parent | fd39a89e0e09de5460626a68e9e443fe0c103c14 [diff] | |
parent | e1bd38c03c16cd27227b3148d2be0ef1ab678448 [diff] |
merge 3.3 (#22643)