]> granicus.if.org Git - python/commitdiff
Merge with 3.2 #15660
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 17 Aug 2012 19:42:12 +0000 (15:42 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 17 Aug 2012 19:42:12 +0000 (15:42 -0400)

Trivial merge