From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Dec 2014 21:08:15 +0000 (-0500)
Subject: merge 3.4 (#23048)
X-Git-Tag: v3.5.0a1~322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ced53cc636e6c6b63a8918b11f6f69fc64b0d33;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23048)
---

7ced53cc636e6c6b63a8918b11f6f69fc64b0d33