]> granicus.if.org Git - python/commitdiff
merge
authorEli Bendersky <eliben@gmail.com>
Fri, 11 Mar 2011 14:40:25 +0000 (16:40 +0200)
committerEli Bendersky <eliben@gmail.com>
Fri, 11 Mar 2011 14:40:25 +0000 (16:40 +0200)

Trivial merge