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

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

e78fc6a0aa56b253bdf4b9ff792d47b026251b70