From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 17 Dec 2016 20:04:43 +0000 (-0800)
Subject: merge 2.7.13 release branch
X-Git-Tag: v2.7.14rc1~334^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb55e68ff0518edb9ce48c4251247518b823a935;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.13 release branch
---

eb55e68ff0518edb9ce48c4251247518b823a935