From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 1 Feb 2015 18:42:45 +0000 (+0100)
Subject: Issue #23352: Merge from 3.4.
X-Git-Tag: v3.5.0a1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7e9a6a0764471d16000d9bd8927b6da24f3335b;p=python

Issue #23352: Merge from 3.4.
---

a7e9a6a0764471d16000d9bd8927b6da24f3335b