From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Mon, 30 Jan 2017 15:59:01 +0000 (+0100)
Subject: Merge pull request #4940 from rgacogne/backport-json11-fixes
X-Git-Tag: rec-4.1.0-alpha1~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c628f9fe3fcf54c225a8b76212e65320f2b9b40a;p=thirdparty%2Fpdns.git

Merge pull request #4940 from rgacogne/backport-json11-fixes

Backport json11 fixes from upstream
---

c628f9fe3fcf54c225a8b76212e65320f2b9b40a