]> granicus.if.org Git - python/commitdiff
Merge
authorSteven Bethard <steven.bethard@gmail.com>
Mon, 4 Apr 2011 00:14:25 +0000 (02:14 +0200)
committerSteven Bethard <steven.bethard@gmail.com>
Mon, 4 Apr 2011 00:14:25 +0000 (02:14 +0200)

Trivial merge