From: bert hubert <bert.hubert@powerdns.com>
Date: Thu, 24 Mar 2016 08:34:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'rgacogne/dnsdist-protobuf'
X-Git-Tag: dnsdist-1.0.0-beta1~67^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe459556e81502b94357f7491b2743bd6699d379;p=pdns

Merge remote-tracking branch 'rgacogne/dnsdist-protobuf'
---

fe459556e81502b94357f7491b2743bd6699d379