From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2014 06:49:09 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1443^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89cef795eba63eef63eb2a7349ef7631f4071ab9;p=python

merge 3.4
---

89cef795eba63eef63eb2a7349ef7631f4071ab9