Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 13 Dec 2016 20:40:15 +0000 (12:40 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 13 Dec 2016 20:40:15 +0000 (12:40 -0800)

Trivial merge