From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 20 Mar 2014 01:52:25 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~2074
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5280feba1db956bd984b9a13a6a5453ec618948;p=python

merge 3.4
---

e5280feba1db956bd984b9a13a6a5453ec618948