From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 17 May 2006 16:10:32 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/commitdiff_plain/0847af4b4e35bc5564bc9efed7774ed6edfbec18?ds=inline

Merge with master
---

0847af4b4e35bc5564bc9efed7774ed6edfbec18