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

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

c74010ebe0df472b67702d06f998a96010c0d011