]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorMichael Foord <michael@voidspace.org.uk>
Wed, 14 Mar 2012 19:59:08 +0000 (12:59 -0700)
committerMichael Foord <michael@voidspace.org.uk>
Wed, 14 Mar 2012 19:59:08 +0000 (12:59 -0700)

Trivial merge