From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 4 Jan 2016 14:46:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into dnsdist-to
X-Git-Tag: dnsdist-1.0.0-alpha2~127^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=291cb67f91842fcb4614f40d9e725a681f7e029b;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into dnsdist-to

Conflicts:
	pdns/dnsrulactions.hh
---

291cb67f91842fcb4614f40d9e725a681f7e029b