Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJonathan Prykop <jonathan@freeside.biz>
Tue, 15 Nov 2016 09:10:32 +0000 (03:10 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Tue, 15 Nov 2016 09:10:32 +0000 (03:10 -0600)

Trivial merge