From: Georg Brandl <georg@python.org>
Date: Sun, 12 Oct 2014 06:45:26 +0000 (+0200)
Subject: #22568: merge with 3.4
X-Git-Tag: v3.5.0a1~688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfd7881aa617f10da0225bfeeb34f6981fbc506f;p=python

#22568: merge with 3.4
---

bfd7881aa617f10da0225bfeeb34f6981fbc506f