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

Merge with 3.4
---

bd44ce8ead3b8088ea837446136dd6c15ba980a8