Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
authorChristopher Burger <burgerc@freeside.biz>
Thu, 29 Nov 2018 19:50:50 +0000 (14:50 -0500)
committerChristopher Burger <burgerc@freeside.biz>
Thu, 29 Nov 2018 19:50:50 +0000 (14:50 -0500)

Trivial merge