From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 9 Jul 2015 08:53:38 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d9aab0d298efea11ca20ffd267ae41095a08d6;p=thirdparty%2Fpdns.git

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

12d9aab0d298efea11ca20ffd267ae41095a08d6