Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJonathan Prykop <jonathan@freeside.biz>
Tue, 8 Nov 2016 08:49:39 +0000 (02:49 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Tue, 8 Nov 2016 08:49:39 +0000 (02:49 -0600)

Trivial merge