From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 27 Nov 2015 08:52:37 +0000 (+0100)
Subject: Merge branch 'master' into dprotect
X-Git-Tag: dnsdist-1.0.0-alpha1~187^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06ad1cb2dd372ea10525c1260db2b074020a778e;p=thirdparty%2Fpdns.git

Merge branch 'master' into dprotect
---

06ad1cb2dd372ea10525c1260db2b074020a778e