]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Wed, 31 Jul 2013 09:58:41 +0000 (11:58 +0200)
committerChristian Heimes <christian@cheimes.de>
Wed, 31 Jul 2013 09:58:41 +0000 (11:58 +0200)

Trivial merge