From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 25 Jan 2015 16:03:41 +0000 (+0100)
Subject: Merge branch 'master' into dnsdist11
X-Git-Tag: dnsdist-1.0.0-alpha1~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37efa5340f67a09ba35ae15cb556f8df9af619e5;p=thirdparty%2Fpdns.git

Merge branch 'master' into dnsdist11

Conflicts:
	pdns/pdns_recursor.cc
---

37efa5340f67a09ba35ae15cb556f8df9af619e5