From: Raymond Hettinger <python@rcn.com>
Date: Tue, 6 Jan 2015 06:00:08 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.5.0a1~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57a3786a62394cb54ea78b58861c221287b4b895;p=thirdparty%2FPython%2Fcpython.git

merge
---

57a3786a62394cb54ea78b58861c221287b4b895