From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 May 2015 02:25:09 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0b2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09479d0b946bd711c45fc221edacc53dcd506637;p=python

merge 3.4
---

09479d0b946bd711c45fc221edacc53dcd506637