From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 17 Dec 2015 10:34:44 +0000 (+0000)
Subject: Merge 3.4 into 3.5
X-Git-Tag: v3.6.0a1~896^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b84ef715b8afecbeb24af6f2435531417e563f4e;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 into 3.5
---

b84ef715b8afecbeb24af6f2435531417e563f4e