From: Georg Brandl <georg@python.org>
Date: Sat, 11 Oct 2014 13:08:18 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.5.0a1~694^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cc05517732f012092e36e3458bcbea11282582c;p=python

merge
---

4cc05517732f012092e36e3458bcbea11282582c