From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 2 May 2013 12:49:28 +0000 (+0200)
Subject: Merge branch 'f/versioning' of github.com:zeha/pdns
X-Git-Tag: auth-3.3-rc1~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f4b247fba1a640c732f8a5bffb55d5cd95ebbe2;p=thirdparty%2Fpdns.git

Merge branch 'f/versioning' of github.com:zeha/pdns
---

1f4b247fba1a640c732f8a5bffb55d5cd95ebbe2