From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Jul 2014 00:17:57 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92e8deebecd5e5d754a523864b2cb2c70fb87866;p=python

merge 3.4
---

92e8deebecd5e5d754a523864b2cb2c70fb87866