]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Wed, 31 Oct 2012 20:05:46 +0000 (22:05 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Wed, 31 Oct 2012 20:05:46 +0000 (22:05 +0200)

Trivial merge