From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Fri, 13 Jan 2017 14:36:05 +0000 (+0100)
Subject: Merge branch 'master' into master
X-Git-Tag: rec-4.1.0-alpha1~328^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4478%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'master' into master
---

f16cc650be3e1dc5144508c8f996bceaea741d57