From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 22:47:31 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b2a6dc42b9bf02408764133a8dfcd843bbd0e66;p=python

merge 3.4
---

0b2a6dc42b9bf02408764133a8dfcd843bbd0e66