From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 21 Mar 2014 21:55:53 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d73913c608467c1203f3f207425951282748be0;p=thirdparty%2Fpdns.git

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

9d73913c608467c1203f3f207425951282748be0