From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 24 Apr 2017 19:26:37 +0000 (+0200)
Subject: [master] Merge branch 'trac5198' (default config improvements)
X-Git-Tag: trac5212_base~12
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=280de81cfe957ccab8a28074bdb0a4bc0e45104e;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5198' (default config improvements)

# Conflicts:
#	doc/examples/ddns/sample1.json
---

280de81cfe957ccab8a28074bdb0a4bc0e45104e