From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 28 Oct 2015 07:15:38 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=549edcfa054cc40d212a9c171f5ec7d353f43260;p=python

Merge with 3.5
---

549edcfa054cc40d212a9c171f5ec7d353f43260