From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 31 Aug 2014 01:06:00 +0000 (-0400)
Subject: merge 3.4 (closes #22307)
X-Git-Tag: v3.5.0a1~990
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c187f15bb7bf23ee7e731f71ae1d9ba4e317364e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (closes #22307)
---

c187f15bb7bf23ee7e731f71ae1d9ba4e317364e