| commit | c40d362a1cd6c36635e91b6c7e7dbf3337b55562 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Dec 31 22:42:45 2011 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Dec 31 22:42:45 2011 -0600 |
| tree | 040951c21f05aa73e685412f7206e6724df69f0d | |
| parent | f606e682a4d2095fcd1dcbb238944b377b362b61 [diff] | |
| parent | 1abde3628b1385127366446026b655b551656322 [diff] |
merge heads