Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
authorChristopher Burger <burgerc@freeside.biz>
Thu, 7 Sep 2017 12:51:58 +0000 (08:51 -0400)
committerChristopher Burger <burgerc@freeside.biz>
Thu, 7 Sep 2017 12:51:58 +0000 (08:51 -0400)

Trivial merge