| commit | 4a5d599b3663e20fafd7f710d6e8e794701d7842 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Jun 27 09:16:23 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Jun 27 09:16:23 2011 -0500 |
| tree | 872c1fd99eb70904649ef1fa42507cfebaf70fd9 | |
| parent | 7e6b3aac856f92b155daddd8607eb128ce4e33b8 [diff] | |
| parent | 2bd9100b2aa3d49f72e2020ecaa6105ef0a065c5 [diff] |
merge heads