From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 18 Nov 2015 18:43:48 +0000 (+0100)
Subject: Merge branch 'dprotect' of github.com:ahupowerdns/pdns into dprotect
X-Git-Tag: dnsdist-1.0.0-alpha1~187^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30f225edd32730b6dccb40be74cb008086cb6214;p=pdns

Merge branch 'dprotect' of github.com:ahupowerdns/pdns into dprotect

Conflicts:
	pdns/dnsname.cc
---

30f225edd32730b6dccb40be74cb008086cb6214