From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 18 Apr 2016 11:05:45 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a8ea7695a99a5cab8c4a71874e31c3778cda7f4;p=thirdparty%2Fpdns.git

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

0a8ea7695a99a5cab8c4a71874e31c3778cda7f4