From: Georg Brandl <georg@python.org>
Date: Thu, 2 Oct 2014 10:35:54 +0000 (+0200)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~780
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f315835662d111adaf6df8652c59185fb863dc3;p=python

merge 3.4
---

1f315835662d111adaf6df8652c59185fb863dc3