| commit | 8485ad1410f790abbd3bb2c019b4657241586f57 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Jan 24 09:06:45 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Jan 24 09:06:45 2012 -0500 |
| tree | 04c8fdbe938b0c746711353ef0960480ce36f2b6 | |
| parent | 3ef2f8c296ec144586fe35babbaf9d644c7ad222 [diff] | |
| parent | 91ecea24f53b99aa190f6b17c2b51d95cb09d233 [diff] |
merge heads