From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 19 Mar 2015 02:36:23 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a3~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41ce610d4ca12ce96aa3a9b9139e416039b18f7b;p=python

merge 3.4
---

41ce610d4ca12ce96aa3a9b9139e416039b18f7b