From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 27 Sep 2015 17:44:43 +0000 (+0200)
Subject: Merge branch 'ednssurg' of github.com:ahupowerdns/pdns into ednssurg
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40cf912460f219422bd4fa56f30ecd3993410a4f;p=thirdparty%2Fpdns.git

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

Conflicts:
	pdns/distributor.hh
---

40cf912460f219422bd4fa56f30ecd3993410a4f