From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 14 Feb 2015 20:17:47 +0000 (-0500)
Subject: merge 3.4 (#22633)
X-Git-Tag: v3.5.0a2~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f80ccf27cba2d2842ec4b85dc73202534f46b526;p=python

merge 3.4 (#22633)
---

f80ccf27cba2d2842ec4b85dc73202534f46b526