Merge pull request #1946 from dibdot/master
authorTed Hess <thess@kitschensync.net>
Wed, 11 Nov 2015 22:00:32 +0000 (17:00 -0500)
committerTed Hess <thess@kitschensync.net>
Wed, 11 Nov 2015 22:00:32 +0000 (17:00 -0500)
adblock: uci support, dynamic uhttpd instance support plus various fixes


Trivial merge