From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 16 May 2006 15:50:23 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/48b43c1418ca9fbd29398be9c28c286dd9404b47?hp=--cc

Merge with master
---

48b43c1418ca9fbd29398be9c28c286dd9404b47