From: Ethan Furman <ethan@stoneleaf.us>
Date: Thu, 19 Mar 2015 01:26:08 +0000 (-0700)
Subject: null merge from 3.4
X-Git-Tag: v3.5.0a3~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a0b9a4bf3cdbe59e562c5d0c27388ca7210f5a0;p=thirdparty%2FPython%2Fcpython.git

null merge from 3.4
---

8a0b9a4bf3cdbe59e562c5d0c27388ca7210f5a0