From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Jun 2016 21:04:11 +0000 (-0700)
Subject: merge 2.7.12 release branch
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d6879bb67e944289362758688f0e55a86fedb6e;p=python

merge 2.7.12 release branch
---

1d6879bb67e944289362758688f0e55a86fedb6e