From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 9 Sep 2014 17:28:13 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-3.4.0-rc2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cfb6f292ab93f6374b6b16fce30d15296a41b32;p=pdns

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

0cfb6f292ab93f6374b6b16fce30d15296a41b32