From: Georg Brandl <georg@python.org>
Date: Sat, 12 Oct 2013 20:57:30 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a4~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32a14662287d30ef58f31b9d20c5226c52b136e8;p=python

merge
---

32a14662287d30ef58f31b9d20c5226c52b136e8