From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 16 Sep 2006 01:14:29 +0000 (+0200)
Subject: Merge with master
X-Git-Tag: tig-0.6~6
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/778e60b28d79bf6135ee127ce34400a5aeca4eec?hp=--cc

Merge with master
---

778e60b28d79bf6135ee127ce34400a5aeca4eec