]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:16 +0000 (13:20 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:16 +0000 (13:20 -0400)
1  2 
.hgtags

diff --cc .hgtags
Simple merge