From: bert hubert <bert.hubert@powerdns.com>
Date: Tue, 17 Nov 2015 12:37:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into dprotect
X-Git-Tag: dnsdist-1.0.0-alpha1~187^2~8^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5640427c92eb4e2156f830dfa1c7348cb41f7a9;p=pdns

Merge remote-tracking branch 'origin/master' into dprotect
---

c5640427c92eb4e2156f830dfa1c7348cb41f7a9