]> granicus.if.org Git - python/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Mon, 9 Sep 2013 06:55:31 +0000 (01:55 -0500)
committerRaymond Hettinger <python@rcn.com>
Mon, 9 Sep 2013 06:55:31 +0000 (01:55 -0500)

Trivial merge