From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 6 Jan 2015 11:49:11 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0aaf0d39b56ded269d500cdd64f40f9f8c747696;p=pdns

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

0aaf0d39b56ded269d500cdd64f40f9f8c747696