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

Merge 2.7.15 release branch
---

0b3800d82aacfe277d6ab7acfa2fce625bd69045