From: Barry Warsaw <barry@python.org>
Date: Tue, 2 Dec 2014 16:31:10 +0000 (-0500)
Subject: Merge 3.4.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de010a968525bfb2680f758f59b175a929d4c0d8;p=python

Merge 3.4.
---

de010a968525bfb2680f758f59b175a929d4c0d8