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?p=inn-innduct.git;a=commitdiff_plain;h=refs%2Fheads%2Finn.adhoc;hp=ded92fa38af4d5031def91097ad0626cc73d1dcf Merge branches 'inn.merged' and 'inn.adhoc' of /home/ian/public-git/inn-innduct ---