From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 28 Nov 2014 02:41:36 +0000 (-0600)
Subject: merge 3.4 (#16561)
X-Git-Tag: v3.5.0a1~422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2292defb3d3c117cf89486713fbb00222656accb;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#16561)
---

2292defb3d3c117cf89486713fbb00222656accb