From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 7 Dec 2014 20:31:06 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e77d153856720b003acf4a873b49e24a196a25d2;p=thirdparty%2Fpdns.git

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

e77d153856720b003acf4a873b49e24a196a25d2