| commit | a63a530eaba50a3d901ec4d1fe90a491fc79f5fd | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Jun 27 09:16:14 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Jun 27 09:16:14 2011 -0500 |
| tree | 3ccfaa1d0077b6ded8e520e0f622dfe9ae5978f5 | |
| parent | 8d7706955849c0e3569e2cb225435c322dfa677e [diff] | |
| parent | 7d80bd19096726dabde3effa8af89ec62365c0c0 [diff] |
merge heads