From: Mark Zealey <mark@markandruth.co.uk>
Date: Fri, 3 Jan 2014 06:58:35 +0000 (+0200)
Subject: merge with origin
X-Git-Tag: rec-3.6.0-rc1~239^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a04608576ee664676cbd91aafd41bfdc85c9fd55;p=thirdparty%2Fpdns.git

merge with origin
---

a04608576ee664676cbd91aafd41bfdc85c9fd55