From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 30 Apr 2014 17:34:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'mdw/mdw/convert-script'
X-Git-Tag: cvs-to-git-conversion^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/adns/commitdiff_plain/194b32e42f9d2a9555b920defef6fffae792e008?ds=sidebyside;hp=194b32e42f9d2a9555b920defef6fffae792e008

Merge remote-tracking branch 'mdw/mdw/convert-script'

"iwj's original" 8298cc36e3a7eef91f722e7115ea8b5a9366fb55
is actually identical to 8e04e8e83b27a61d1471c81de5f8aabe29dda30a
apart from the .gitignore

Conflicts:
	convert
---