]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 24 Dec 2012 18:00:05 +0000 (20:00 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Mon, 24 Dec 2012 18:00:05 +0000 (20:00 +0200)

Trivial merge