summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTim Peters <tim@python.org>2013-08-21 23:52:57 (GMT)
committerTim Peters <tim@python.org>2013-08-21 23:52:57 (GMT)
commit0b169125caf768b2dce97537d10470b3fdee9ec9 (patch)
tree60c4aaf61ad02cc95149ef18de7ccb656da5b008 /Misc
parent1e440cf5a267ce1787aa048525d45eb56fc06135 (diff)
parent86d53caddad11808ca332ab93ec35508b602a0dd (diff)
downloadcpython-0b169125caf768b2dce97537d10470b3fdee9ec9.zip
cpython-0b169125caf768b2dce97537d10470b3fdee9ec9.tar.gz
cpython-0b169125caf768b2dce97537d10470b3fdee9ec9.tar.bz2
Merge 3.2 into 3.3.
The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.
Diffstat (limited to 'Misc')
0 files changed, 0 insertions, 0 deletions