Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
authorChristopher Burger <burgerc@freeside.biz>
Thu, 16 Nov 2017 03:27:47 +0000 (22:27 -0500)
committerChristopher Burger <burgerc@freeside.biz>
Thu, 16 Nov 2017 03:27:47 +0000 (22:27 -0500)

Trivial merge