From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 27 May 2014 07:30:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/cnamefollow'
X-Git-Tag: rec-3.6.0-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21e7976ac46f990c67d56eee1432b0245602312a;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/cnamefollow'
---

21e7976ac46f990c67d56eee1432b0245602312a