From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 21 May 2013 19:14:05 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: auth-3.3-rc1~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2df08388b0518c75ab280d88b012ed97be317d9f;p=thirdparty%2Fpdns.git

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

2df08388b0518c75ab280d88b012ed97be317d9f