]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 6 Apr 2013 19:23:57 +0000 (21:23 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 6 Apr 2013 19:23:57 +0000 (21:23 +0200)

Trivial merge