]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Sat, 31 Mar 2012 16:46:45 +0000 (18:46 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Sat, 31 Mar 2012 16:46:45 +0000 (18:46 +0200)

Trivial merge