From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 24 Dec 2014 22:07:19 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~277
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3226f9618f1dfacc7d0a98b0821f8ab5b180e482;p=python

merge 3.4
---

3226f9618f1dfacc7d0a98b0821f8ab5b180e482