Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 20 Jan 2016 12:46:18 +0000 (04:46 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 20 Jan 2016 12:46:18 +0000 (04:46 -0800)

Trivial merge