From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 7 May 2013 10:16:05 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-3.3-rc1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a0f028ad93d60cf1eff14db0e095d08447a0591;p=thirdparty%2Fpdns.git

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

6a0f028ad93d60cf1eff14db0e095d08447a0591