From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 19 Jul 2014 23:35:08 +0000 (-0700)
Subject: merge 3.4 (#17210)
X-Git-Tag: v3.5.0a1~1256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0172b115db6b63ee2faa7823b530128949f8fdef;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#17210)
---

0172b115db6b63ee2faa7823b530128949f8fdef