| commit | 12f2bffce1be0e36e2cf11a8be80de7fcb76dd54 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Jun 19 09:38:02 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Jun 19 09:38:02 2011 -0500 |
| tree | 1f37a3639480738daf90d359dbc239ac664860f3 | |
| parent | defe6f61fe8595d0d2cc194c120ef0b3dc3a4286 [diff] | |
| parent | 2510d9e8d9d3244c8d35efdd01bca265755655de [diff] |
merge heads