]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 8 Jan 2017 08:37:32 +0000 (00:37 -0800)
committerRaymond Hettinger <python@rcn.com>
Sun, 8 Jan 2017 08:37:32 +0000 (00:37 -0800)

Trivial merge