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

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

fae58c196ef6b3460cc4f6a1df2931cd55ecc305