From: Barry Warsaw <barry@python.org>
Date: Mon, 1 Dec 2014 23:17:29 +0000 (-0500)
Subject: Trunk merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f3eb39968d08bcb140f34d85d2a803434917bab;p=python

Trunk merge.
---

6f3eb39968d08bcb140f34d85d2a803434917bab