| commit | 49aaad3c476abe77e9d90d20a7622fa5b1f5c38c | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jun 10 12:32:07 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jun 10 12:32:07 2011 -0500 |
| tree | 79b640803d65f31895f0ce8009c785b4ddb836c1 | |
| parent | ae10b3201cbed5fb181757f2ef80f9cd7c1fff45 [diff] | |
| parent | df55334d52ba297e8bba4fd267fde68f48256e1c [diff] |
merge heads