From: Raymond Hettinger <python@rcn.com>
Date: Sat, 30 May 2015 05:14:50 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b2~13^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b811b649cae04b2d37ead60bfc7a0b0767f308b7;p=thirdparty%2FPython%2Fcpython.git

merge
---

b811b649cae04b2d37ead60bfc7a0b0767f308b7