From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 31 Oct 2015 18:51:04 +0000 (+0100)
Subject: Merge branch 'master' into luaqa
X-Git-Tag: dnsdist-1.0.0-alpha1~262^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c6e74275900571ba7b1e3ebce83397725716be1;p=thirdparty%2Fpdns.git

Merge branch 'master' into luaqa
---

9c6e74275900571ba7b1e3ebce83397725716be1