Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
authorChristopher Burger <burgerc@freeside.biz>
Fri, 1 Dec 2017 22:11:10 +0000 (17:11 -0500)
committerChristopher Burger <burgerc@freeside.biz>
Fri, 1 Dec 2017 22:11:10 +0000 (17:11 -0500)

Trivial merge