chiark / gitweb /
Merge branches 'inn.merged' and 'inn.adhoc' of /home/ian/public-git/inn-innduct inn.adhoc
authorIan Jackson <ian@chiark.greenend.org.uk>
Sat, 29 May 2010 17:07:32 +0000 (18:07 +0100)
committerIan Jackson <ian@chiark.greenend.org.uk>
Sat, 29 May 2010 17:07:32 +0000 (18:07 +0100)

Trivial merge