From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Oct 2014 03:58:37 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~647
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52f2ae8d3303fdb994be981dcebd020ae58aeea1;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

52f2ae8d3303fdb994be981dcebd020ae58aeea1