From: Barry Warsaw <barry@python.org>
Date: Mon, 1 Dec 2014 23:17:29 +0000 (-0500)
Subject: Trunk merge.
X-Git-Tag: v3.5.0a1~395
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f3eb39968d08bcb140f34d85d2a803434917bab;p=thirdparty%2FPython%2Fcpython.git

Trunk merge.
---

6f3eb39968d08bcb140f34d85d2a803434917bab