Merge pull request #752 from tru7/patch-3
authorTed Hess <thess@kitschensync.net>
Thu, 8 Jan 2015 00:50:54 +0000 (19:50 -0500)
committerTed Hess <thess@kitschensync.net>
Thu, 8 Jan 2015 00:50:54 +0000 (19:50 -0500)
linknx: fix permissions, add conffiles in Makefile


Trivial merge