Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 4 Nov 2016 00:25:05 +0000 (17:25 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 4 Nov 2016 00:25:05 +0000 (17:25 -0700)

Trivial merge