From: Raymond Hettinger <python@rcn.com>
Date: Sun, 14 Jun 2015 23:08:35 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0b3~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=355654c1c7668a4078c5647b402fbc5fc01af998;p=python

merge
---

355654c1c7668a4078c5647b402fbc5fc01af998