From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 25 Nov 2013 12:35:42 +0000 (+0100)
Subject: Merge commit '2f6e0c95cdcda9124151712aca3a369f3abee237'
X-Git-Tag: rec-3.6.0-rc1~331
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0704de856369cde324d3ffc57f1f1b1e7c7f61eb;p=pdns

Merge commit '2f6e0c95cdcda9124151712aca3a369f3abee237'
(merge 3/4rds of mind04/tests, closing #1118)
---

0704de856369cde324d3ffc57f1f1b1e7c7f61eb