]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorChristian Heimes <christian@cheimes.de>
Sat, 20 Jul 2013 23:54:26 +0000 (01:54 +0200)
committerChristian Heimes <christian@cheimes.de>
Sat, 20 Jul 2013 23:54:26 +0000 (01:54 +0200)

Trivial merge