]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sun, 23 Jun 2013 20:57:22 +0000 (22:57 +0200)
committerChristian Heimes <christian@cheimes.de>
Sun, 23 Jun 2013 20:57:22 +0000 (22:57 +0200)

Trivial merge