From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 10 Dec 2014 14:41:53 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ea380899c54e53accae767cf0fdc693c26b1226;p=thirdparty%2Fpdns.git

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

6ea380899c54e53accae767cf0fdc693c26b1226