From: Mark Zealey <mark@markandruth.co.uk>
Date: Fri, 3 Jan 2014 08:44:44 +0000 (+0200)
Subject: Merge branch 'master' into nonexist-fail-bind
X-Git-Tag: rec-3.6.0-rc1~265^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b80e8f7b2bb46832fe3c2c2877f97ac517a5578;p=thirdparty%2Fpdns.git

Merge branch 'master' into nonexist-fail-bind
---

7b80e8f7b2bb46832fe3c2c2877f97ac517a5578