chiark / gitweb /
Merge branch 'zealot'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Aug 2011 16:24:02 +0000 (17:24 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Aug 2011 16:24:02 +0000 (17:24 +0100)
commit8acaed657eb4db47c448c8a582810bf301ff47ef
tree84beca817e796bc28bbb49104656e0bdcf3b264a
parent0ae8e6867facf7eb8055533a642026d7c9e9cf38
parent0789c49b475067e89dcd39ffd2cf11871dcb7e80
Merge branch 'zealot'

Conflicts:
.gitignore
ipif/Makefile