From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 15:51:17 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~654
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=315aa404030f425a8bf7fdb5a5275c118555bc37;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4
---

315aa404030f425a8bf7fdb5a5275c118555bc37