From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 24 Sep 2006 23:13:51 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/b799b7d277f85f1dd2b2c998b6d0c63c40b0d9ea

Merge with master
---

b799b7d277f85f1dd2b2c998b6d0c63c40b0d9ea