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

Trivial merge