From: Brett Cannon <brett@python.org>
Date: Sat, 25 May 2013 15:29:03 +0000 (-0400)
Subject: merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21cc628e4cb0e2d8bffb99bd8d7fd2868b592983;p=python

merge
---

21cc628e4cb0e2d8bffb99bd8d7fd2868b592983