]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 9 Aug 2012 12:27:45 +0000 (15:27 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 9 Aug 2012 12:27:45 +0000 (15:27 +0300)

Trivial merge