From: Christian Heimes <christian@python.org>
Date: Thu, 22 Sep 2016 14:54:06 +0000 (+0200)
Subject: merge
X-Git-Tag: v2.7.13rc1~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cae643022f2dc263c383c6c939df8f1f90da0fde;p=python

merge
---

cae643022f2dc263c383c6c939df8f1f90da0fde