From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 28 Feb 2014 11:00:46 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=446fd41f3c7ba20c53e6f284011d3e55ce5e9c94;p=thirdparty%2Fpdns.git

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

446fd41f3c7ba20c53e6f284011d3e55ce5e9c94