Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Tue, 3 May 2016 20:49:31 +0000 (13:49 -0700)
committerMark Wells <mark@freeside.biz>
Tue, 3 May 2016 20:49:31 +0000 (13:49 -0700)

Trivial merge