From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 26 Nov 2014 19:06:52 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d9b1469e6ed29b729e5aa609db8d37d9c8ca867;p=thirdparty%2Fpdns.git

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

7d9b1469e6ed29b729e5aa609db8d37d9c8ca867