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

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

7fb3d2bbc2d4b52a53784c944cb03c6a8440c1e4