From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 May 2014 23:17:34 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1682
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89aea5075eeeed4df0033cec4caa3f1eba3bf168;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

89aea5075eeeed4df0033cec4caa3f1eba3bf168