]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Fri, 20 Jul 2012 11:55:20 +0000 (14:55 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Fri, 20 Jul 2012 11:55:20 +0000 (14:55 +0300)

Trivial merge