From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 17 Jan 2015 01:46:37 +0000 (-0500)
Subject: merge 3.4 (#22986)
X-Git-Tag: v3.5.0a1~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b883296f606d6c401ca27148cd826b0f9529f70;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22986)
---

5b883296f606d6c401ca27148cd826b0f9529f70