From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Jun 2014 20:03:54 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1424
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c03dc0f164d468f87509675c727ac6e6322264c7;p=python

merge
---

c03dc0f164d468f87509675c727ac6e6322264c7