From: Tim Golden <mail@timgolden.me.uk>
Date: Wed, 8 Apr 2015 15:53:21 +0000 (+0100)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a4~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013