From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 14 Jun 2006 21:28:35 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/6650347d7629076210c4736f744be98664b09047?ds=inline;hp=--cc

Merge with master
---

6650347d7629076210c4736f744be98664b09047