]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Fri, 23 Mar 2012 15:37:41 +0000 (16:37 +0100)
committerStefan Krah <skrah@bytereef.org>
Fri, 23 Mar 2012 15:37:41 +0000 (16:37 +0100)

Trivial merge