]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 13 Mar 2016 08:12:49 +0000 (00:12 -0800)
committerRaymond Hettinger <python@rcn.com>
Sun, 13 Mar 2016 08:12:49 +0000 (00:12 -0800)

Trivial merge