Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJonathan Prykop <jonathan@freeside.biz>
Fri, 18 Nov 2016 11:19:46 +0000 (05:19 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Fri, 18 Nov 2016 11:19:46 +0000 (05:19 -0600)

Trivial merge