From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 06:48:55 +0000 (+0000)
Subject: Issue #24984: Merge 3.4 into 3.5
X-Git-Tag: v3.5.1rc1~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24a9bd0d395012ac85571b402c10bf103837c0f5;p=python

Issue #24984: Merge 3.4 into 3.5
---

24a9bd0d395012ac85571b402c10bf103837c0f5