From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 23 Nov 2015 11:09:52 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=209268d6a76f29bb59b10c339a160aa6eacb097a;p=pdns

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

209268d6a76f29bb59b10c339a160aa6eacb097a