From: Mark Zealey <mark@markandruth.co.uk>
Date: Mon, 6 Jan 2014 14:28:15 +0000 (+0200)
Subject: Merge branch 'master' into backend-getauth
X-Git-Tag: rec-3.6.0-rc1~245^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0838eadc2738eaaac0f88dafd980df6b2c37b680;p=thirdparty%2Fpdns.git

Merge branch 'master' into backend-getauth
---

0838eadc2738eaaac0f88dafd980df6b2c37b680