Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Fri, 30 Oct 2015 18:24:47 +0000 (11:24 -0700)
committerMark Wells <mark@freeside.biz>
Fri, 30 Oct 2015 18:24:47 +0000 (11:24 -0700)

Trivial merge