Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 10 Dec 2015 09:02:00 +0000 (01:02 -0800)
committerMark Wells <mark@freeside.biz>
Thu, 10 Dec 2015 09:02:00 +0000 (01:02 -0800)

Trivial merge