]> granicus.if.org Git - python/commitdiff
Merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 4 Oct 2012 16:55:04 +0000 (19:55 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 4 Oct 2012 16:55:04 +0000 (19:55 +0300)

Trivial merge