From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 Feb 2015 23:02:21 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83e814d8526b74a80fdf7a4c901f689d15cb1f5d;p=python

merge 3.4
---

83e814d8526b74a80fdf7a4c901f689d15cb1f5d