]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Mon, 2 Dec 2013 19:02:04 +0000 (20:02 +0100)
committerChristian Heimes <christian@cheimes.de>
Mon, 2 Dec 2013 19:02:04 +0000 (20:02 +0100)

Trivial merge