From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 18 Dec 2014 14:05:34 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdd5416d7870a815c6a814dc217db2eed8c942ff;p=thirdparty%2Fpdns.git

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

cdd5416d7870a815c6a814dc217db2eed8c942ff