From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 29 May 2016 16:47:38 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.6.0a2~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea083fafd55ecfe718df72ac42c5063910e089c6;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

ea083fafd55ecfe718df72ac42c5063910e089c6