From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Jun 2014 01:00:07 +0000 (-0700)
Subject: merge 3.4 (#13143)
X-Git-Tag: v3.5.0a1~1430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7534539536c0f512b57430177cc2e6fea5b92be4;p=python

merge 3.4 (#13143)
---

7534539536c0f512b57430177cc2e6fea5b92be4