From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 8 Jan 2016 09:41:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into tsig-ixfr
X-Git-Tag: dnsdist-1.0.0-alpha2~113^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3190%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into tsig-ixfr
---

8ce62cbbd5e84ee2dfcf668cca386f3dca285642