From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 13 Nov 2015 09:21:58 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0186d9c06a2fb26c365ab8ad6c53a68d5f9a3b44;p=thirdparty%2Fpdns.git

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

0186d9c06a2fb26c365ab8ad6c53a68d5f9a3b44