From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 30 Dec 2014 21:17:09 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0396cd706738a8efab375f7d1c2d1b27f9f6fdd0;p=python

merge 3.4
---

0396cd706738a8efab375f7d1c2d1b27f9f6fdd0