From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 22 Jun 2014 23:27:10 +0000 (-0700)
Subject: merge 3.4 (#16667)
X-Git-Tag: v3.5.0a1~1431
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19db33fb081e02baefc319dd3caf39d75834f9eb;p=python

merge 3.4 (#16667)
---

19db33fb081e02baefc319dd3caf39d75834f9eb