Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 30 Jun 2017 18:06:01 +0000 (11:06 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 30 Jun 2017 18:06:01 +0000 (11:06 -0700)

Trivial merge