]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 8 Sep 2015 04:37:17 +0000 (00:37 -0400)
committerRaymond Hettinger <python@rcn.com>
Tue, 8 Sep 2015 04:37:17 +0000 (00:37 -0400)

Trivial merge