From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 12 May 2015 23:16:20 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=276e9c841d6b0a8aa0caf727fd54763fcc8d13f7;p=python

merge 3.4
---

276e9c841d6b0a8aa0caf727fd54763fcc8d13f7