From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 5 Jan 2015 12:26:59 +0000 (+0100)
Subject: Merge branch 'master' into prequery
X-Git-Tag: rec-3.7.0-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=720d36d92fd071cc8c3aa78af6b218b521555206;p=thirdparty%2Fpdns.git

Merge branch 'master' into prequery
---

720d36d92fd071cc8c3aa78af6b218b521555206