From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Sun, 6 Dec 2015 15:07:57 +0000 (+0100)
Subject: Merge pull request #2996 from zeha/jsoninterface
X-Git-Tag: dnsdist-1.0.0-alpha1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e41045290a370502b078de4c8713759c027d25;p=thirdparty%2Fpdns.git

Merge pull request #2996 from zeha/jsoninterface

Rename setting json-interface to api
---

74e41045290a370502b078de4c8713759c027d25