]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 00:31:32 +0000 (16:31 -0800)
committerRaymond Hettinger <python@rcn.com>
Tue, 22 Nov 2016 00:31:32 +0000 (16:31 -0800)

Trivial merge