From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 13 Feb 2017 20:59:45 +0000 (+0100)
Subject: Merge branch 'ci-test' into 'develop'
X-Git-Tag: release-1.7.1-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39d7e6e5116026bc9c332179340d231d12f3780f;p=thirdparty%2Fldns.git

Merge branch 'ci-test' into 'develop'

CI integration

See merge request !1
---

39d7e6e5116026bc9c332179340d231d12f3780f