]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Thu, 24 Jan 2013 14:39:55 +0000 (15:39 +0100)
committerStefan Krah <skrah@bytereef.org>
Thu, 24 Jan 2013 14:39:55 +0000 (15:39 +0100)

Trivial merge