| commit | dbd4efa21f49d4bae68e0a3d05196712bedc7b46 | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Sat Mar 19 16:23:18 2011 -0700 |
| committer | Guido van Rossum <guido@python.org> | Sat Mar 19 16:23:18 2011 -0700 |
| tree | 70989df155291654c208fe11787883858194648b | |
| parent | 3a6134569f0b0343a72d774fcfc7124cd07b4f49 [diff] | |
| parent | d7bed77815da554a53aae61e2c64b88f11c475f0 [diff] |
Merge from 2.6.