Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 29 Jun 2017 20:39:47 +0000 (13:39 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 29 Jun 2017 20:39:47 +0000 (13:39 -0700)

Trivial merge