From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Oct 2014 14:58:21 +0000 (+0000)
Subject: Merge branch 'master' of chiark:public-git/adns
X-Git-Tag: adns-1.5.0~1
X-Git-Url: https://git.distorted.org.uk/~mdw/adns/commitdiff_plain/2403ca203cab4aaf9c84c49629851b6fc3bcf343

Merge branch 'master' of chiark:public-git/adns
---

2403ca203cab4aaf9c84c49629851b6fc3bcf343