From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 8 Jun 2015 21:14:13 +0000 (-0400)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0b3~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20f628ee083faa8d25996138e6f98ce91e2dcc4c;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

20f628ee083faa8d25996138e6f98ce91e2dcc4c