From: Georg Brandl <georg@python.org>
Date: Thu, 30 Oct 2014 21:50:00 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~567
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55c2ae8cb137db37bd3f985661fa5887989670e9;p=python

merge with 3.4
---

55c2ae8cb137db37bd3f985661fa5887989670e9