From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 15:51:53 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~739
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2756e7e2810a32d04729ea9bf41357ef2b916ec4;p=python

merge with 3.4
---

2756e7e2810a32d04729ea9bf41357ef2b916ec4