From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 24 Aug 2014 23:04:25 +0000 (-0500)
Subject: merge 3.4 (#22267)
X-Git-Tag: v3.5.0a1~1012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d475731c546eb850dc451d4508ad7138788a2a9a;p=python

merge 3.4 (#22267)
---

d475731c546eb850dc451d4508ad7138788a2a9a