From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 27 Oct 2015 07:38:18 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1f1c5ea35816c6010be5be654342186e221739f;p=python

Merge with 3.4
---

b1f1c5ea35816c6010be5be654342186e221739f