]> granicus.if.org Git - python/commitdiff
Merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Apr 2013 11:47:05 +0000 (14:47 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Apr 2013 11:47:05 +0000 (14:47 +0300)

Trivial merge