From: Raymond Hettinger <python@rcn.com>
Date: Sat, 2 May 2015 17:45:21 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b1~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b3b98c965025d374ba7f8517fc88371771433e3;p=thirdparty%2FPython%2Fcpython.git

merge
---

7b3b98c965025d374ba7f8517fc88371771433e3