From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 24 Apr 2015 08:16:21 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285f206dc2afe54197b1283c4e9fca01092b0568;p=thirdparty%2Fpdns.git

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

Conflicts:
	docs/secpoll.zone
---

285f206dc2afe54197b1283c4e9fca01092b0568