From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 11 Dec 2014 08:42:31 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c133284996098e07eb0c5fda00511fa7ed342901;p=thirdparty%2Fpdns.git

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

c133284996098e07eb0c5fda00511fa7ed342901