From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 3 May 2010 12:35:28 +0000 (+0100)
Subject: Merge branch 'master' of login.chiark.greenend.org.uk:public-git/inn-innduct
X-Git-Tag: innduct-0.1~57
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;ds=sidebyside;h=3df79b4d579a18b4138463457f6266adce966474;p=innduct.git

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

3df79b4d579a18b4138463457f6266adce966474