From: Larry Hastings <larry@hastings.org>
Date: Wed, 8 Oct 2014 09:56:18 +0000 (-0700)
Subject: Mostly-null-merge from 3.4 branch following 3.4.2 release.
X-Git-Tag: v3.5.0a1~736
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c78319d9b833ad936140bd993e215fb71977d372;p=python

Mostly-null-merge from 3.4 branch following 3.4.2 release.
---

c78319d9b833ad936140bd993e215fb71977d372