From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 17 May 2006 11:51:20 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/61fa407fbb1c7bd7482172ed22e2fc220021b130?hp=--cc

Merge with master
---

61fa407fbb1c7bd7482172ed22e2fc220021b130