From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 4 Nov 2014 02:06:07 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~527
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98e1b9158ce950e7448ab3860bc556002b8a8e4a;p=python

merge 3.4
---

98e1b9158ce950e7448ab3860bc556002b8a8e4a