]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 15 Nov 2012 14:30:30 +0000 (16:30 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 15 Nov 2012 14:30:30 +0000 (16:30 +0200)

Trivial merge