| commit | 02ffa08990085cffacb7cbdcc6bcde767dac6256 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Jan 02 09:00:38 2012 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Jan 02 09:00:38 2012 -0600 |
| tree | e60ad7fb54b05c079c83c5ecab73b2d51f631c4c | |
| parent | 22a29708fd99325fef8e462bce0ff5b67210cb23 [diff] | |
| parent | 42663334cd9ef3348732e6a229478e67730b4ecb [diff] |
merge heads