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

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

fe0fd488309d8deda74dd13b5f1ff7ba351a5add