]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 28 Oct 2012 12:12:50 +0000 (14:12 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 28 Oct 2012 12:12:50 +0000 (14:12 +0200)

Trivial merge