From: Brett Cannon <brett@python.org>
Date: Fri, 25 Oct 2013 17:53:06 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0b1~541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a4cbc00ab7bd62560e11a7ed09a1b24c7e96ae1;p=thirdparty%2FPython%2Fcpython.git

merge
---

6a4cbc00ab7bd62560e11a7ed09a1b24c7e96ae1