From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 5 Nov 2014 16:31:02 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~519
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=141579c8868c1ed2482c2a485e7c6367724cb505;p=python

merge 3.4
---

141579c8868c1ed2482c2a485e7c6367724cb505