Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 1 Feb 2017 20:16:26 +0000 (12:16 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 1 Feb 2017 20:16:26 +0000 (12:16 -0800)

Trivial merge