From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 7 Oct 2014 15:18:58 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.7.0-rc1~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2d634e958c52dfb652485c7b9c6f241b2381637;p=thirdparty%2Fpdns.git

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

a2d634e958c52dfb652485c7b9c6f241b2381637