]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 23 Dec 2012 10:51:40 +0000 (12:51 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 23 Dec 2012 10:51:40 +0000 (12:51 +0200)

Trivial merge