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

merge 3.4
---

34b9c24b3589e40fe63ffdcf34bef2a4b5dae366