From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 20 Jan 2016 22:02:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into recpack
X-Git-Tag: dnsdist-1.0.0-alpha2~48^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3274%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into recpack
---

cc1479768e442d62d0e0cb5596817ead715767b8