From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 12 Jun 2015 20:47:58 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b3~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8322b0694539863e7ea66785a7e6d5022ffd284a;p=python

Merge with 3.4
---

8322b0694539863e7ea66785a7e6d5022ffd284a