From: Barry Warsaw <barry@python.org>
Date: Fri, 19 Dec 2014 16:21:10 +0000 (-0500)
Subject: Trunk merge.
X-Git-Tag: v3.5.0a1~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99f66db18815ee16be1316978e451911453c906e;p=python

Trunk merge.
---

99f66db18815ee16be1316978e451911453c906e