From: Ian Jackson 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?a=commitdiff_plain;h=3d970c9429e88c355e0342d04cc922707d4a9c80;hp=94b7914e7dd5ba544fec9e0f89540822a5b30468;p=inn-innduct.git Merge branches 'inn.merged' and 'inn.adhoc' of /home/ian/public-git/inn-innduct ---