From: Georg Brandl <georg@python.org>
Date: Thu, 2 Oct 2014 06:39:01 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~785
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b83f56f91562547a72abe7faf8a023c7929dc731;p=python

merge with 3.4
---

b83f56f91562547a72abe7faf8a023c7929dc731