From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 15 Aug 2014 01:55:01 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1075
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6afc2250b3febc18f8f64e0b146da9c10ccb3a1d;p=python

Merge with 3.4
---

6afc2250b3febc18f8f64e0b146da9c10ccb3a1d