From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Mar 2015 14:37:59 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a3~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d2d63ed7dab4487e2f0f0d0f3d2cf5b185b5082;p=python

merge 3.4
---

5d2d63ed7dab4487e2f0f0d0f3d2cf5b185b5082