From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 10 Dec 2014 16:05:35 +0000 (-0500)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=649e1f141a839c0e90b8ebd940ab08eee62fcfad;p=python

merge 3.4
---

649e1f141a839c0e90b8ebd940ab08eee62fcfad