From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 10 Nov 2015 07:52:04 +0000 (+0100)
Subject: Merge branch 'master' into ednssubnet
X-Git-Tag: dnsdist-1.0.0-alpha1~230^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8b92c01919069f32eaa82a50cb69d5d4f36fe6;p=pdns

Merge branch 'master' into ednssubnet

Conflicts:
	pdns/dnsname.hh
---

dc8b92c01919069f32eaa82a50cb69d5d4f36fe6