From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 16 Jan 2015 14:30:07 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3038e642e45605773031a63a601fa50fffcca693;p=thirdparty%2Fpdns.git

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

3038e642e45605773031a63a601fa50fffcca693