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

Merge 3.4
---

815f1a9128695ade021d1bbbff7533d48e11cf9f