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

merge
---

a99771e54208d17ae71293764f486efa1f1af044