| commit | 85c46b163561368fb16451cbaa2c899c8870d3a7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Oct 27 08:22:27 2011 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Oct 27 08:22:27 2011 -0400 |
| tree | 6d7be568381514cdfc5d21cb2318c759b0ddab25 | |
| parent | 0c0d7560987a4a9c7290f44f4a22806d9d04a4d5 [diff] | |
| parent | 87ba642ce6f325fa8e3ec3beff736cc135d9c754 [diff] |
merge heads