From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 19 Sep 2014 21:30:21 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~897
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=004c00b7f4e0005cdedf373dc0a183ee98f92c87;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

004c00b7f4e0005cdedf373dc0a183ee98f92c87