From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 23 Nov 2014 17:43:43 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~451
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c;p=python

merge 3.4
---

f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c