]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Sat, 7 Apr 2012 14:10:04 +0000 (16:10 +0200)
committerStefan Krah <skrah@bytereef.org>
Sat, 7 Apr 2012 14:10:04 +0000 (16:10 +0200)

Trivial merge