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

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

d7a9b9ab386c63c733d319a0e2ba1836d29ee018