From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 26 Nov 2014 20:57:09 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d2b3b1f55f775627fda5589ffac105f32de0ae6;p=pdns

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

0d2b3b1f55f775627fda5589ffac105f32de0ae6