From: Peter van Dijk <peter@7bits.nl>
Date: Fri, 6 Sep 2013 08:06:21 +0000 (-0700)
Subject: Merge pull request #992 from zeha/ws
X-Git-Tag: rec-3.6.0-rc1~462
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e34f346d488d79785c07199d193dab0c83f3a84f;p=thirdparty%2Fpdns.git

Merge pull request #992 from zeha/ws

Land json webserver changes
---

e34f346d488d79785c07199d193dab0c83f3a84f