From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 28 May 2013 12:56:35 +0000 (+0200)
Subject: Merge branch 'master' into rel/auth-3.3
X-Git-Tag: auth-3.3-rc2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=915764dded4ebe916ab95d349593174a2cb8d772;p=thirdparty%2Fpdns.git

Merge branch 'master' into rel/auth-3.3
---

915764dded4ebe916ab95d349593174a2cb8d772