]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Sat, 19 Jan 2013 01:53:18 +0000 (17:53 -0800)
committerRaymond Hettinger <python@rcn.com>
Sat, 19 Jan 2013 01:53:18 +0000 (17:53 -0800)

Trivial merge