From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Apr 2018 22:48:13 +0000 (-0700)
Subject: merge 2.7.15 release branch
X-Git-Tag: v2.7.16rc1~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c8df51ac6937a77901027fbf351b67ea04e04c;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.15 release branch
---

75c8df51ac6937a77901027fbf351b67ea04e04c