From: bert hubert Date: Wed, 18 Nov 2015 18:42:48 +0000 (+0100) Subject: Merge branch 'master' into dprotect X-Git-Tag: dnsdist-1.0.0-alpha1~187^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e740347fa24456456e03aea887c65bf3b5a1043;p=thirdparty%2Fpdns.git Merge branch 'master' into dprotect Conflicts: pdns/dnsname.cc pdns/dnsname.hh --- 7e740347fa24456456e03aea887c65bf3b5a1043