commit | bfcdcf928225f6e34036a0f768c34dcc4814c860 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon May 23 16:30:29 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon May 23 16:30:29 2011 -0500 |
tree | 9836e4881f93739fc390b1fe40a2f54357b266b1 | |
parent | 5cc10b00094f06af56dedd02d39bc46886e17c70 [diff] | |
parent | 08c719eb955fd5fb8bb3e39c9c39e5b50b539179 [diff] |
merge heads