]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Thu, 6 Nov 2014 05:28:19 +0000 (21:28 -0800)
committerRaymond Hettinger <python@rcn.com>
Thu, 6 Nov 2014 05:28:19 +0000 (21:28 -0800)

Trivial merge