]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 05:34:39 +0000 (21:34 -0800)
committerRaymond Hettinger <python@rcn.com>
Thu, 17 Nov 2016 05:34:39 +0000 (21:34 -0800)

Trivial merge