From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 03:45:58 +0000 (+0000)
Subject: Merge 3.5 branches
X-Git-Tag: v3.5.1rc1~415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a563b683952bf3f77fa7c5e1999e004c2947857;p=python

Merge 3.5 branches
---

6a563b683952bf3f77fa7c5e1999e004c2947857