Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 10 Jun 2016 21:21:38 +0000 (14:21 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 10 Jun 2016 21:21:38 +0000 (14:21 -0700)

Trivial merge