From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Thu, 16 Feb 2017 11:17:43 +0000 (+0100)
Subject: Merge pull request #5010 from pieterlexis/backport-4940
X-Git-Tag: rec-4.0.5-rc1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8595ed9cc64b45864286cc4109dd5a152a397e6b;p=pdns

Merge pull request #5010 from pieterlexis/backport-4940

Backport #4940: Backport json11 fixes from upstream
---

8595ed9cc64b45864286cc4109dd5a152a397e6b