From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 24 Jul 2014 04:39:59 +0000 (-0700)
Subject: merge 3.4 (#22036)
X-Git-Tag: v3.5.0a1~1222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a819105fdd45ca94cf5a94b1c737984918d83d60;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22036)
---

a819105fdd45ca94cf5a94b1c737984918d83d60