From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 4 Nov 2015 10:02:58 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852a160cbf2e9224e276d30f73ad2ad53583086f;p=thirdparty%2Fpdns.git

Merge branch 'master' of github.com:PowerDNS/pdns
---

852a160cbf2e9224e276d30f73ad2ad53583086f