]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 18 Dec 2011 18:31:02 +0000 (19:31 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 18 Dec 2011 18:31:02 +0000 (19:31 +0100)

Trivial merge