From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 30 Apr 2010 23:25:38 +0000 (+0100)
Subject: Merge branch 'master' of login.chiark.greenend.org.uk:public-git/inn-innduct
X-Git-Tag: innduct-0.1~86
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=commitdiff_plain;h=5a29e8b2a57806ef2030eccc9a7a510dba2c3180

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

5a29e8b2a57806ef2030eccc9a7a510dba2c3180