From: Raymond Hettinger <python@rcn.com>
Date: Wed, 2 Jul 2014 23:31:54 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.5.0a1~1354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748ff8bfd137a834056eb0cd3bfb1d5105c46522;p=python

merge
---

748ff8bfd137a834056eb0cd3bfb1d5105c46522