From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 18 Mar 2014 20:06:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13178890d79836010d7bb81d3c5cc3e0b6635a86;p=thirdparty%2Fpdns.git

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

13178890d79836010d7bb81d3c5cc3e0b6635a86