From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Oct 2014 14:48:06 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~629
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c06ac5e5817fc7038c92115035107f9ff6c7a64;p=python

merge 3.4
---

8c06ac5e5817fc7038c92115035107f9ff6c7a64