From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 29 May 2006 19:41:01 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/097d926a004c84858dbf81c05247491dc2870b68?hp=--cc

Merge with master
---

097d926a004c84858dbf81c05247491dc2870b68