From: Peter van Dijk Date: Fri, 15 Nov 2013 09:00:26 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/i-maravic/pdns into i-maravic-master X-Git-Tag: rec-3.6.0-rc1~343 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6130afe588bc95a17857cc2c2ddb8fb89ea5d9;p=thirdparty%2Fpdns.git Merge branch 'master' of https://github.com/i-maravic/pdns into i-maravic-master --- 5f6130afe588bc95a17857cc2c2ddb8fb89ea5d9