From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 30 Oct 2014 13:08:54 +0000 (+0100)
Subject: sorry Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1350c41beaa0e8b97c757095fb7569cdb7d8ad3;p=thirdparty%2Fpdns.git

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

a1350c41beaa0e8b97c757095fb7569cdb7d8ad3