]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Mon, 2 Apr 2012 13:04:14 +0000 (15:04 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 2 Apr 2012 13:04:14 +0000 (15:04 +0200)

Trivial merge