From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 24 Apr 2014 07:14:14 +0000 (+0200)
Subject: Merge branch 'jsonzone2sql' of github.com:ahupowerdns/pdns into jsonzone2sql
X-Git-Tag: rec-3.6.0-rc1~43^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80581a97b7a0f080616169dd753db9310ab77d6f;p=thirdparty%2Fpdns.git

Merge branch 'jsonzone2sql' of github.com:ahupowerdns/pdns into jsonzone2sql
---

80581a97b7a0f080616169dd753db9310ab77d6f