From: Georg Brandl <georg@python.org>
Date: Thu, 17 Oct 2013 17:52:33 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bb0ac0acec4b081838a308070747fdadd2d7939;p=python

merge with 3.3
---

2bb0ac0acec4b081838a308070747fdadd2d7939