From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 5 Jan 2015 20:39:06 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=743ffe248c6b109ad7a3e0687da8ab2d22f985ce;p=python

merge 3.4
---

743ffe248c6b109ad7a3e0687da8ab2d22f985ce