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

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

a94671bd76359f793a91e4af5a56d4a1c70902b5