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

merge 3.4
---

12abc86903d7393c9e8d6c9a3dbc8100dbdee02b