| commit | 0b169125caf768b2dce97537d10470b3fdee9ec9 | [log] [tgz] |
|---|---|---|
| author | Tim Peters <tim@python.org> | Wed Aug 21 18:52:57 2013 -0500 |
| committer | Tim Peters <tim@python.org> | Wed Aug 21 18:52:57 2013 -0500 |
| tree | 60c4aaf61ad02cc95149ef18de7ccb656da5b008 | |
| parent | 1e440cf5a267ce1787aa048525d45eb56fc06135 [diff] | |
| parent | 86d53caddad11808ca332ab93ec35508b602a0dd [diff] |
Merge 3.2 into 3.3. The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.