Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 4 Jun 2016 01:26:05 +0000 (18:26 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 4 Jun 2016 01:26:05 +0000 (18:26 -0700)

Trivial merge