From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Jun 2014 20:51:51 +0000 (-0700)
Subject: merge 3.4 (#10503)
X-Git-Tag: v3.5.0a1~1498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8dfd73a2b42917b07698f446e20ab296fdfe0ef2;p=python

merge 3.4 (#10503)
---

8dfd73a2b42917b07698f446e20ab296fdfe0ef2