From: Georg Brandl <georg@python.org>
Date: Mon, 17 Mar 2014 06:36:59 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a748ca982b242219686e8469f121512d3f3cc92;p=python

merge with 3.4
---

3a748ca982b242219686e8469f121512d3f3cc92