Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 8 Sep 2016 18:05:38 +0000 (11:05 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 8 Sep 2016 18:05:38 +0000 (11:05 -0700)

Trivial merge