From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 28 Nov 2014 20:04:47 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e51b886c136a0701dc1a0f33f7375e618c54bd8c;p=thirdparty%2Fpdns.git

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

e51b886c136a0701dc1a0f33f7375e618c54bd8c