From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 29 May 2013 17:56:15 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-3.3-rc2~65^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6905cf4ce503026e56a648ce1c628feaea6592ec;p=thirdparty%2Fpdns.git

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

6905cf4ce503026e56a648ce1c628feaea6592ec