From: Brett Cannon <brett@python.org>
Date: Fri, 13 Mar 2015 16:50:16 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a3~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb1dde5df57ce598c79b344239417e2671489845;p=python

Merge 3.4
---

cb1dde5df57ce598c79b344239417e2671489845