From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 20 Aug 2011 16:24:02 +0000 (+0100)
Subject: Merge branch 'zealot'
X-Git-Tag: userv/0.6.1~78
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=8acaed657eb4db47c448c8a582810bf301ff47ef

Merge branch 'zealot'

Conflicts:
	.gitignore
	ipif/Makefile
---

8acaed657eb4db47c448c8a582810bf301ff47ef