]> granicus.if.org Git - python/commitdiff
merge heads
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sat, 29 Dec 2012 21:11:20 +0000 (23:11 +0200)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sat, 29 Dec 2012 21:11:20 +0000 (23:11 +0200)

Trivial merge