From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 3 Feb 2015 09:40:16 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88c1080eefc2e7bb5874273294cd3e19b57e01c4;p=thirdparty%2Fpdns.git

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

88c1080eefc2e7bb5874273294cd3e19b57e01c4