]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:49:04 +0000 (19:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:49:04 +0000 (19:49 +0200)

Trivial merge