From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 8 Dec 2015 18:22:02 +0000 (+0100)
Subject: Merge branch 'adp': better infrastructure for metering traffic, prettier grepq
X-Git-Tag: dnsdist-1.0.0-alpha1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c71dcea0ab5438a22b27b3a1f1bd4e6b8cf564be;p=thirdparty%2Fpdns.git

Merge branch 'adp': better infrastructure for metering traffic, prettier grepq
---

c71dcea0ab5438a22b27b3a1f1bd4e6b8cf564be