]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'rgacogne/dnsdist-protobuf' into remi-protobuf
authorbert hubert <bert.hubert@powerdns.com>
Thu, 24 Mar 2016 09:15:56 +0000 (10:15 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Thu, 24 Mar 2016 09:15:56 +0000 (10:15 +0100)

Trivial merge