From: Mark Zealey <mark@markandruth.co.uk>
Date: Fri, 3 Jan 2014 07:08:31 +0000 (+0200)
Subject: merge from master
X-Git-Tag: rec-3.6.0-rc1~240^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e4f72169273f39c4ff03dd25ccb8441fafe49f4;p=pdns

merge from master
---

3e4f72169273f39c4ff03dd25ccb8441fafe49f4