]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Wed, 15 Aug 2012 19:53:56 +0000 (22:53 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Wed, 15 Aug 2012 19:53:56 +0000 (22:53 +0300)

Trivial merge