Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Mon, 13 Jun 2016 20:31:50 +0000 (13:31 -0700)
committerMark Wells <mark@freeside.biz>
Mon, 13 Jun 2016 20:31:50 +0000 (13:31 -0700)

Trivial merge