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

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

a10b43849b3091151b98d36a74d261ac621e454e