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)
commit25c6b0818f632a2b6db3185e8c3d68917649e815
tree0a3451632bd3abdb8db8ce899476faa84b3919ce
parent7be003f32459427996a14dc48a904c3b04197b69
parent1f5ed5d0409495515eb63d84e0547725391f4a8a
Merge pull request #1946 from dibdot/master

adblock: uci support, dynamic uhttpd instance support plus various fixes