]> granicus.if.org Git - python/commitdiff
Merge 3.3 into default.
authorTim Peters <tim@python.org>
Wed, 21 Aug 2013 23:55:56 +0000 (18:55 -0500)
committerTim Peters <tim@python.org>
Wed, 21 Aug 2013 23:55:56 +0000 (18:55 -0500)
The only file change is adding the v3.2.5 tag to the .hgtags file.

1  2 
.hgtags

diff --cc .hgtags
Simple merge