From: Raymond Hettinger <python@rcn.com>
Date: Wed, 26 Aug 2015 15:09:50 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0a1~1735
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a1a0bbbf160e62f97d68d5743469ed56e3c1706;p=python

merge
---

7a1a0bbbf160e62f97d68d5743469ed56e3c1706