]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Sun, 18 Nov 2012 23:57:20 +0000 (00:57 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 18 Nov 2012 23:57:20 +0000 (00:57 +0100)

Trivial merge