]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Oct 2012 16:21:24 +0000 (19:21 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Oct 2012 16:21:24 +0000 (19:21 +0300)

Trivial merge