From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 27 Jan 2014 01:10:56 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v2.7.8~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62ea43cc063b75d3ba1e5080da1e3ec8aef2de51;p=python

Merge heads.
---

62ea43cc063b75d3ba1e5080da1e3ec8aef2de51