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

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

fe6f63a012f1c7b090b45cdaebb988c567cddde9