From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 16 May 2006 15:19:14 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/24bd80d642da4c0cddc30e0ef05ab84e0f0bcf8a?ds=sidebyside

Merge with master
---

24bd80d642da4c0cddc30e0ef05ab84e0f0bcf8a