]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sun, 14 Jun 2015 23:08:59 +0000 (16:08 -0700)
committerRaymond Hettinger <python@rcn.com>
Sun, 14 Jun 2015 23:08:59 +0000 (16:08 -0700)

Trivial merge