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

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

8fbf9032f1eadb764dae3e6043faba77d91c69a7