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

merge
---

983db8905c6b1551caac0263f54766d5af21c9f6