| commit | 652e758fc41c953c5235f389e7dbb481bc915f0a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Aug 08 17:22:57 2012 -0700 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Aug 08 17:22:57 2012 -0700 |
| tree | 2c87e935f9bbfe79d391ccfd31e32bc126a4327f | |
| parent | 1a1367b821ee6e724cc4d66934f93d84d8544161 [diff] | |
| parent | 9d512ab97f642215c16eace1705f585f41eb4162 [diff] |
merge heads