From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 12 Jun 2015 18:55:22 +0000 (+0200)
Subject: Merge pull request #2588 from seitzbg/patch-1
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~78^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fb59bbc0aaa01b09e8e2882a97c22c01991bb3d;p=thirdparty%2Fpdns.git

Merge pull request #2588 from seitzbg/patch-1

Update settings.md
---

1fb59bbc0aaa01b09e8e2882a97c22c01991bb3d