From: Raymond Hettinger <python@rcn.com>
Date: Mon, 14 Jul 2014 08:52:44 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0823d4bfc963dc11d197154447773e00cd9598d9;p=python

merge
---

0823d4bfc963dc11d197154447773e00cd9598d9