Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Tue, 28 Jun 2016 23:39:05 +0000 (16:39 -0700)
committerMark Wells <mark@freeside.biz>
Tue, 28 Jun 2016 23:39:05 +0000 (16:39 -0700)

Trivial merge