From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 13 Nov 2015 08:39:51 +0000 (+0100)
Subject: Merge branch 'ednssubnet'
X-Git-Tag: dnsdist-1.0.0-alpha1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab8e94c555b1d3a3c753d27fe7c08e3c3e1714b;p=thirdparty%2Fpdns.git

Merge branch 'ednssubnet'
---

bab8e94c555b1d3a3c753d27fe7c08e3c3e1714b