From: Brett Cannon <brett@python.org>
Date: Fri, 5 Dec 2014 23:11:15 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f7c7924c33750cd5e9e8b0f6a7d0d5788303a52;p=python

Merge with 3.4
---

9f7c7924c33750cd5e9e8b0f6a7d0d5788303a52