From: Raymond Hettinger <python@rcn.com>
Date: Thu, 22 May 2014 23:04:26 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.5.0a1~1618
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14d062f2f541966bf79fc058d3407249309c414d;p=python

merge
---

14d062f2f541966bf79fc058d3407249309c414d