]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Thu, 5 Apr 2012 20:59:41 +0000 (22:59 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Thu, 5 Apr 2012 20:59:41 +0000 (22:59 +0200)

Trivial merge