]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sun, 14 Oct 2012 00:53:40 +0000 (02:53 +0200)
committerChristian Heimes <christian@cheimes.de>
Sun, 14 Oct 2012 00:53:40 +0000 (02:53 +0200)

Trivial merge