From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 17 Jun 2015 13:01:36 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c057c617f5c9db8dc9dd760b6dd72d687178c2f1;p=thirdparty%2Fpdns.git

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

c057c617f5c9db8dc9dd760b6dd72d687178c2f1