From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 Oct 2014 19:51:21 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~669
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37b8df10ba303fd0dd67388b30e84415c8faafdf;p=python

merge 3.4
---

37b8df10ba303fd0dd67388b30e84415c8faafdf