]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Mon, 21 Oct 2013 09:59:34 +0000 (11:59 +0200)
committerChristian Heimes <christian@cheimes.de>
Mon, 21 Oct 2013 09:59:34 +0000 (11:59 +0200)

Trivial merge