]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Mon, 10 Sep 2012 15:01:21 +0000 (17:01 +0200)
committerChristian Heimes <christian@cheimes.de>
Mon, 10 Sep 2012 15:01:21 +0000 (17:01 +0200)

Trivial merge