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

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

08468bdfed2596ff2b32447da52096cfa642d3b8