From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 7 Apr 2014 17:27:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b5e94b93bb2bac1be7d7b10b50a925bf69f35cb;p=thirdparty%2Fpdns.git

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

6b5e94b93bb2bac1be7d7b10b50a925bf69f35cb