Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones
authorMark Wooding <mdw@distorted.org.uk>
Tue, 31 May 2011 12:29:29 +0000 (13:29 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 31 May 2011 12:29:29 +0000 (13:29 +0100)
* 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones:
  Makefile.m4: Make the LaTeX documnt be optional.
  harlequin.lisp: Use the statically defined address for `guvnor'.
  distorted.lisp, harlequin.lisp: Use explicit filetype for `hosts.lisp'.

1  2 
distorted.lisp

diff --cc distorted.lisp
Simple merge