From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 8 Jun 2015 21:41:39 +0000 (-0400)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~2087
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ae067d8323f92cb56ca0f624d369f0f3adeeba8;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

3ae067d8323f92cb56ca0f624d369f0f3adeeba8