From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 10 Oct 2014 03:13:54 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~719
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=365e28238f3ccde7f9024a37c212381746748d54;p=python

Merge with 3.4
---

365e28238f3ccde7f9024a37c212381746748d54