| commit | e236ad311371b4dddbecdf1fb39ad5af58cdbe34 | [log] [tgz] |
|---|---|---|
| author | Barry Warsaw <barry@python.org> | Wed Mar 14 17:18:46 2012 -0700 |
| committer | Barry Warsaw <barry@python.org> | Wed Mar 14 17:18:46 2012 -0700 |
| tree | 1c1cd65a68059a8a5a4bfbfb2ac61984e721b5f0 | |
| parent | 3cef2a931c041d0ffd72d701b9bedd0b531bb1a8 [diff] | |
| parent | e9bc2f773ff86780ca86a36a21d43f3ecfd61357 [diff] |
merge 2.6