From: Barry Warsaw <barry@python.org>
Date: Mon, 1 Dec 2014 23:16:12 +0000 (-0500)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0a1~396
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfad816e4024cf830c813f7c4faec7b7d3b6bb60;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4.
---

cfad816e4024cf830c813f7c4faec7b7d3b6bb60