From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Mar 2016 17:39:18 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.6.0a1~368^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d9fc4101e9b77d950c5d0d022fc59adb5db32ae;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

9d9fc4101e9b77d950c5d0d022fc59adb5db32ae