| commit | 7fa5a99b0693100077a556f05e3c6638b837389b | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Jan 24 09:07:06 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Jan 24 09:07:06 2012 -0500 |
| tree | 31be037cf6e9978bafaa3070f588e09bd6c99e34 | |
| parent | 91eef984fde07756e230b32a5341772ba412bdfa [diff] | |
| parent | 5311c1d7ab24f862b9b0bb272a9aee9c4f4ac023 [diff] |
merge heads