| commit | 9d7601fcea7c9cee6132c4a4dffb482cfa351785 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:24:21 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:24:21 2012 -0500 |
| tree | bbcac236f3ba1983cf2c8f0f95ef38fea2cb8471 | |
| parent | dbe0329d4c7f31618d913a1e8c233239e05a54eb [diff] | |
| parent | 876e789f650a68b1fe05be7060794357cf13e3d3 [diff] |
merge 2.6