]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 4 Dec 2016 19:00:57 +0000 (11:00 -0800)
committerRaymond Hettinger <python@rcn.com>
Sun, 4 Dec 2016 19:00:57 +0000 (11:00 -0800)

Trivial merge