From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Mar 2015 01:59:41 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e35a17af68fc315dff98ac63d60a623a63bdd6bd;p=python

merge 3.4
---

e35a17af68fc315dff98ac63d60a623a63bdd6bd