From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 26 Nov 2014 00:05:40 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~440
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dcaa4b1c6d98797120ce0a96d458f923505418d;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

8dcaa4b1c6d98797120ce0a96d458f923505418d