]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 29 Nov 2012 17:52:21 +0000 (19:52 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 29 Nov 2012 17:52:21 +0000 (19:52 +0200)

Trivial merge