Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Fri, 20 Nov 2015 22:51:40 +0000 (14:51 -0800)
committerMark Wells <mark@freeside.biz>
Fri, 20 Nov 2015 22:51:40 +0000 (14:51 -0800)

Trivial merge