]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Mon, 22 Jul 2013 08:37:41 +0000 (10:37 +0200)
committerChristian Heimes <christian@cheimes.de>
Mon, 22 Jul 2013 08:37:41 +0000 (10:37 +0200)

Trivial merge