From: Raymond Hettinger <python@rcn.com>
Date: Thu, 26 Jun 2014 16:25:41 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a157867a3d10e4ee802fa2fd910f2dda383fa823;p=python

merge
---

a157867a3d10e4ee802fa2fd910f2dda383fa823