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

Trivial merge