]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Mon, 31 Oct 2011 18:23:25 +0000 (19:23 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Mon, 31 Oct 2011 18:23:25 +0000 (19:23 +0100)

Trivial merge