From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 2 Oct 2014 04:17:08 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~788
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55f763426b894dfd05af3f414f609ef069abd794;p=python

Merge with 3.4
---

55f763426b894dfd05af3f414f609ef069abd794