Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 5 Nov 2015 23:56:33 +0000 (15:56 -0800)
committerMark Wells <mark@freeside.biz>
Thu, 5 Nov 2015 23:56:33 +0000 (15:56 -0800)

Trivial merge