From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Dec 2014 22:26:43 +0000 (-0500)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3e8b07bcbb12cb09519495700fdbe3e4c9b9836;p=python

merge 3.4
---

e3e8b07bcbb12cb09519495700fdbe3e4c9b9836