From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 02:51:53 +0000 (+0000)
Subject: Merge 3.5 branches
X-Git-Tag: v3.5.1rc1~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5127cdea054eba8d1f7631f050f3a91cc01b6542;p=python

Merge 3.5 branches
---

5127cdea054eba8d1f7631f050f3a91cc01b6542