]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Tue, 1 Sep 2015 09:33:20 +0000 (02:33 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 1 Sep 2015 09:33:20 +0000 (02:33 -0700)

Trivial merge