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

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

361c1f995ef78234d4f2d0084a586d07e6d6a157