From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 9 Jun 2015 11:06:58 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090a81c44c537280980eff71f4152233b840d101;p=thirdparty%2Fpdns.git

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

Conflicts:
	docs/secpoll.zone
---

090a81c44c537280980eff71f4152233b840d101