From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 23 Apr 2014 19:47:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3799c1080c81a386e6064ca540a4ec4e2f10f42;p=thirdparty%2Fpdns.git

Merge branch 'master' of github.com:PowerDNS/pdns
---

f3799c1080c81a386e6064ca540a4ec4e2f10f42