]> granicus.if.org Git - python/commitdiff
Merge heads
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Mar 2013 07:22:03 +0000 (02:22 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Mar 2013 07:22:03 +0000 (02:22 -0500)

Trivial merge