From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 5 Mar 2015 03:50:25 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de8eca46385842a2d5c75ee5a9a8c596735f9c68;p=python

merge 3.4
---

de8eca46385842a2d5c75ee5a9a8c596735f9c68