From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 29 Aug 2014 13:52:12 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-3.4.0-rc2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e456264a7af818ddfae609b74c286e4e50a083ba;p=thirdparty%2Fpdns.git

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

e456264a7af818ddfae609b74c286e4e50a083ba