From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 26 Nov 2014 20:36:08 +0000 (-0600)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12abc86903d7393c9e8d6c9a3dbc8100dbdee02b;p=python

merge 3.4
---

12abc86903d7393c9e8d6c9a3dbc8100dbdee02b