From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 30 May 2013 08:30:26 +0000 (+0200)
Subject: Merge branch 'master' into rel/auth-3.3
X-Git-Tag: auth-3.3-rc2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480c3f6f066d559234e4ba15832fef1ad44360b5;p=thirdparty%2Fpdns.git

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

480c3f6f066d559234e4ba15832fef1ad44360b5