From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 10 Dec 2014 08:25:27 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156416c4899ff5bb8c2cb24f6e87efbfe5cb7e3c;p=pdns

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

156416c4899ff5bb8c2cb24f6e87efbfe5cb7e3c