commit | a28cf6fef927dce1d7ab21c322a959b835674e78 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 31 13:36:21 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 31 13:36:21 2012 -0400 |
tree | 8f1c5274907eac249d685a49e4c856411669fc46 | |
parent | 742b2f8d7a6b728e925ad83f704af0ff5fb06848 [diff] | |
parent | 0a4dfc3db93120581d15d70885ad76789963082b [diff] |
merge heads