From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 13 Jun 2016 10:19:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-4.0.0-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04e9f9b2af6e8319432637073153c2d940b0ed37;p=thirdparty%2Fpdns.git

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

04e9f9b2af6e8319432637073153c2d940b0ed37