]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 18:51:09 +0000 (20:51 +0200)
committerJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 18:51:09 +0000 (20:51 +0200)

Trivial merge