From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 15 Jan 2015 09:21:51 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc17dae82b53eadc58727f5ace986394799589d7;p=thirdparty%2Fpdns.git

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

fc17dae82b53eadc58727f5ace986394799589d7