From: Raymond Hettinger <python@rcn.com>
Date: Sat, 2 May 2015 17:07:08 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b1~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20b7325680a05299231719b829e90dc4e8ffa6a7;p=python

merge
---

20b7325680a05299231719b829e90dc4e8ffa6a7