Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Fri, 13 May 2016 21:31:18 +0000 (14:31 -0700)
committerMark Wells <mark@freeside.biz>
Fri, 13 May 2016 21:31:18 +0000 (14:31 -0700)

Trivial merge