From: Ian Jackson <ian@chiark.greenend.org.uk>
Date: Sat, 29 May 2010 17:07:32 +0000 (+0100)
Subject: Merge branches 'inn.merged' and 'inn.adhoc' of /home/ian/public-git/inn-innduct
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=commitdiff_plain;h=refs%2Fheads%2Finn.adhoc

Merge branches 'inn.merged' and 'inn.adhoc' of /home/ian/public-git/inn-innduct
---

3d970c9429e88c355e0342d04cc922707d4a9c80