Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 3 Feb 2016 04:57:38 +0000 (20:57 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 3 Feb 2016 04:57:38 +0000 (20:57 -0800)

Trivial merge