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

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

c658640c0536a00a5a3c1567d2093d9acde2e066