| commit | c6cfd4aa8826b75d972f33f7c625bbe79c493d5f | [log] [tgz] |
|---|---|---|
| author | Barry Warsaw <barry@python.org> | Fri Oct 07 14:45:25 2011 -0400 |
| committer | Barry Warsaw <barry@python.org> | Fri Oct 07 14:45:25 2011 -0400 |
| tree | f483a30f7b6c18622b7b6ff486398479a55fef62 | |
| parent | 78f89d8c38e2c71c5e6a89a32022626a1d8d8922 [diff] | |
| parent | f394e4785159167fe8889dd2537c8a74e01d4cc5 [diff] |
Branch merge.