From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 12:38:58 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~743
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92b47a4d0fb976ca1b3637e36b2762caac4e62b4;p=python

merge with 3.4
---

92b47a4d0fb976ca1b3637e36b2762caac4e62b4