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

Merge with master
---

0c1745a4c8711bb021921e8446113e366901fc37