]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Tue, 23 Aug 2011 17:49:43 +0000 (19:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Tue, 23 Aug 2011 17:49:43 +0000 (19:49 +0200)

Trivial merge