]> granicus.if.org Git - python/commitdiff
Merge heads
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 Apr 2012 14:59:52 +0000 (16:59 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 18 Apr 2012 14:59:52 +0000 (16:59 +0200)

Trivial merge