From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Dec 2014 04:14:23 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53553c4376d709fa33212d190f1ec4fa90233e32;p=python

merge 3.4
---

53553c4376d709fa33212d190f1ec4fa90233e32