From: Raymond Hettinger <python@rcn.com>
Date: Wed, 25 Jun 2014 01:07:33 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cfec399dbaa7572826f111cf83742cfe65c0e75;p=python

merge
---

5cfec399dbaa7572826f111cf83742cfe65c0e75