From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 8 Apr 2015 15:11:45 +0000 (-0400)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1c5dea3c29d398ab58b45dd152a032489eddf58;p=python

merge 3.4
---

f1c5dea3c29d398ab58b45dd152a032489eddf58