commit | 50ff85812f2c0eb488569531a8cfbb56b7f76b0c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Sep 13 01:45:50 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Sep 13 01:45:50 2014 -0400 |
tree | 9a8e93321d394b654c5a60375f7101f0bd763f91 | |
parent | 08d4a4f4880a24e07f4faa42f53fddee9e7ac0fc [diff] | |
parent | 7c8b89e156a0d50a115946c63fd7226f2a9ef508 [diff] |
merge 3.4