]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merged
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 23 May 2011 05:04:05 +0000 (07:04 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 23 May 2011 05:04:05 +0000 (07:04 +0200)

Trivial merge