From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 20 Oct 2014 18:22:21 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09a87f53fb4b0695165bd0add1378543d6e97e4f;p=thirdparty%2Fpdns.git

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

09a87f53fb4b0695165bd0add1378543d6e97e4f