From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 3 Sep 2006 20:04:25 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/c0b25a413f6d670ede018ac46a101992853c20ff

Merge with master
---

c0b25a413f6d670ede018ac46a101992853c20ff