Merge pull request #3961 from EricLuehrsen/unbound_20170206
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 6 Feb 2017 13:53:05 +0000 (15:53 +0200)
committerGitHub <noreply@github.com>
Mon, 6 Feb 2017 13:53:05 +0000 (15:53 +0200)
Unbound: bug fix odhcpd and add auto adblock


Trivial merge