From: Barry Warsaw <barry@python.org>
Date: Fri, 6 Feb 2015 16:59:26 +0000 (-0500)
Subject: Trunk merge.
X-Git-Tag: v3.5.0a1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3d9ae2c19b9e627683c667387b12c0372382703;p=python

Trunk merge.
---

d3d9ae2c19b9e627683c667387b12c0372382703