]> granicus.if.org Git - python/commitdiff
Merge heads.
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 27 Jan 2014 01:12:18 +0000 (20:12 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 27 Jan 2014 01:12:18 +0000 (20:12 -0500)

Trivial merge