From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 8 Jan 2015 12:02:10 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d04beb594daec448f1b6a9d051343e5b4ec0cd50;p=thirdparty%2Fpdns.git

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

d04beb594daec448f1b6a9d051343e5b4ec0cd50