]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 16 Mar 2012 23:24:12 +0000 (00:24 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 16 Mar 2012 23:24:12 +0000 (00:24 +0100)

Trivial merge