From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 28 May 2013 10:26:59 +0000 (+0200)
Subject: Merge branch 'master' into rel/auth-3.3
X-Git-Tag: auth-3.3-rc2~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e81323814468335c8d7212fa7ab2f43bc309d9;p=pdns

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

48e81323814468335c8d7212fa7ab2f43bc309d9