From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Tue, 4 May 2010 08:44:31 +0000 (+0100)
Subject: Merge branch 'master' of login.chiark.greenend.org.uk:public-git/inn-innduct
X-Git-Tag: innduct-0.1~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=f4edee10297eb6cf34c745a1a68ed796339abe5e;p=innduct.git

Merge branch 'master' of login.chiark.greenend.org.uk:public-git/inn-innduct
---

f4edee10297eb6cf34c745a1a68ed796339abe5e