From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 16 May 2006 18:10:42 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/11c9cad0dd844a76d03fdd16ea47fb28b6e87b57?ds=sidebyside;hp=-c

Merge with master
---

11c9cad0dd844a76d03fdd16ea47fb28b6e87b57