From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 06:50:07 +0000 (+0000)
Subject: Issue #24984: Merge 3.5 into 3.6
X-Git-Tag: v3.6.0a1~1627
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98b30cb18a5281b301831c1a8dc5328b494706d9;p=python

Issue #24984: Merge 3.5 into 3.6
---

98b30cb18a5281b301831c1a8dc5328b494706d9