From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 10 Dec 2014 23:50:13 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afd6f63739cba92abc5f23384fbe30980ff25131;p=python

Merge with 3.4
---

afd6f63739cba92abc5f23384fbe30980ff25131