Merge pull request #3848 from jp-bennett/master
authorTed Hess <thess@kitschensync.net>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
committerGitHub <noreply@github.com>
Mon, 16 Jan 2017 13:12:28 +0000 (08:12 -0500)
commit735d35fbb3fdcea878fab9439328a07a26ee85a4
treed4510fc3419cca24419ac55aa163b270250e64b7
parentcff84b9b538e3bbf7dd361d3beb6e66570907665
parente5251d18159981f3b02f30182bff854a881318e7
Merge pull request #3848 from jp-bennett/master

Fwknopd: Various updates