From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 28 Sep 2014 16:57:22 +0000 (-0400)
Subject: merge 3.4 (#22379)
X-Git-Tag: v3.5.0a1~831
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2f93885b07bd3e78d803e83a4a8d893273e6642;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22379)
---

a2f93885b07bd3e78d803e83a4a8d893273e6642