From: Georg Brandl <georg@python.org>
Date: Tue, 8 Oct 2013 18:27:35 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a4~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65087aec17a465aff3ee5e78fc70d7b9430e6c56;p=python

merge heads
---

65087aec17a465aff3ee5e78fc70d7b9430e6c56