From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 2 Jan 2015 09:54:24 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~67^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2498075979e26c64ae960ec4be1a810946d1cfe;p=pdns

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

e2498075979e26c64ae960ec4be1a810946d1cfe