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

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

faa09bfe29004ba4c1c9ce6f69ad9b0c62dc9c11