From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 30 Dec 2015 07:11:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin' into lua-fixups
X-Git-Tag: dnsdist-1.0.0-alpha2~137^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9c12a046430014245e91bb1d1efc6e7eb0d9d8;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin' into lua-fixups
---

ae9c12a046430014245e91bb1d1efc6e7eb0d9d8