From: Ned Deily <nad@acm.org>
Date: Mon, 15 Jun 2015 01:30:46 +0000 (-0700)
Subject: null merge 3.5 to default (9a0c5ffe7420 merged 3.4 to default, bypassing 3.5)
X-Git-Tag: v3.6.0a1~2070
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df00b10858367a2b8d9226b53ab542371bc14556;p=python

null merge 3.5 to default (9a0c5ffe7420 merged 3.4 to default, bypassing 3.5)
---

df00b10858367a2b8d9226b53ab542371bc14556