From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:53:56 +0000 (-0700)
Subject: null merge 3.4
X-Git-Tag: v3.5.0a1~1585
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f4c963e7ab64a9051e944c6dfdace268c6dd086;p=thirdparty%2FPython%2Fcpython.git

null merge 3.4
---

9f4c963e7ab64a9051e944c6dfdace268c6dd086