Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
authorChristopher Burger <burgerc@freeside.biz>
Tue, 3 Oct 2017 15:16:27 +0000 (11:16 -0400)
committerChristopher Burger <burgerc@freeside.biz>
Tue, 3 Oct 2017 15:16:27 +0000 (11:16 -0400)

Trivial merge