Merge branch 'dhcpdiscover' of https://github.com/aparcar/packages into cci-work
authorTed Hess <thess@kitschensync.net>
Sat, 29 Dec 2018 16:55:08 +0000 (11:55 -0500)
committerTed Hess <thess@kitschensync.net>
Sat, 29 Dec 2018 16:55:08 +0000 (11:55 -0500)

Trivial merge