commit | 66b371e0001f5a8de4765c23e2e88e610fb4808d | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Jun 20 21:40:34 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Jun 20 21:40:34 2011 -0500 |
tree | 3b4fd04b6a4a25454a3196e01307c4945a2d8ce6 | |
parent | f63d615f8bae0a2ad994fb65e37b8657da93a941 [diff] | |
parent | 2fae27b735f4d93c8a7789a7a98857e1ce3c7193 [diff] |
merge heads