From: Paul Moore <p.f.moore@gmail.com>
Date: Tue, 19 Apr 2016 21:59:48 +0000 (+0100)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=201c4ecf180c5318d9ec40062e34943570c5fa32;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

201c4ecf180c5318d9ec40062e34943570c5fa32