From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 8 Oct 2014 11:10:35 +0000 (+0200)
Subject: Merge branch 'alias'
X-Git-Tag: rec-3.7.0-rc1~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d2c3d2167e94062462d927997f0265f181a1e6;p=thirdparty%2Fpdns.git

Merge branch 'alias'
---

84d2c3d2167e94062462d927997f0265f181a1e6