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

Merge
---

ff7f428b38d22e1a168fff3f9eac383e8e5511f5