]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 2 May 2015 17:45:21 +0000 (10:45 -0700)
committerRaymond Hettinger <python@rcn.com>
Sat, 2 May 2015 17:45:21 +0000 (10:45 -0700)

Trivial merge