From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Mar 2015 14:10:45 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01c782960f1e4bafa35f908ab3b203db4537253;p=python

merge 3.4
---

f01c782960f1e4bafa35f908ab3b203db4537253