From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 23 Nov 2015 16:10:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df96138e1ab55004ef9c29818e218bbd3fc079b0;p=thirdparty%2Fpdns.git

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

df96138e1ab55004ef9c29818e218bbd3fc079b0